From 8cf49d4956f23d58fd247438ad1a2bf2d78b8719 Mon Sep 17 00:00:00 2001 From: Andrea Cimbalo Date: Sat, 13 Aug 2016 00:08:49 +0200 Subject: [PATCH] fix service tasks name --- handlers/service.yaml | 4 +-- roles/apache/defaults/main.yml | 2 -- roles/apache/tasks/main.yaml | 16 --------- roles/dokuwiki/meta/main.yaml | 1 + roles/dokuwiki/tasks/main.yaml | 2 +- roles/dokuwiki/templates/docuwiki_nginx.j2 | 13 +------ .../dokuwiki/templates/docuwiki_nginx.j2.TODO | 36 +++++++++++++++++++ roles/lxc_guest/tasks/main.yaml | 1 - roles/nginx/defaults/main.yml | 1 + roles/nginx/handlers/main.yaml | 3 +- roles/nginx/tasks/main.yaml | 11 ++++++ roles/roundcube/tasks/main.yaml | 2 +- ...roundcube-config.j2 => roundcube_nginx.j2} | 5 ++- roles/sympa/tasks/main.yaml | 5 --- tasks/service.yaml | 6 ++-- wiki_server.yaml => wiki.yaml | 2 +- 16 files changed, 62 insertions(+), 48 deletions(-) delete mode 100644 roles/apache/defaults/main.yml delete mode 100644 roles/apache/tasks/main.yaml create mode 100644 roles/dokuwiki/templates/docuwiki_nginx.j2.TODO rename roles/roundcube/templates/{roundcube-config.j2 => roundcube_nginx.j2} (85%) rename wiki_server.yaml => wiki.yaml (84%) diff --git a/handlers/service.yaml b/handlers/service.yaml index f61fdac..5c4812f 100644 --- a/handlers/service.yaml +++ b/handlers/service.yaml @@ -1,5 +1,5 @@ --- -- name: restart "{{ service_name }}" +- name: restart {{ service_name }} service: name="{{ service_name }}" state=restarted -- name: reload "{{ service_name }}" +- name: reload {{ service_name }} service: name="{{ service_name }}" state=reloaded diff --git a/roles/apache/defaults/main.yml b/roles/apache/defaults/main.yml deleted file mode 100644 index c8c6b89..0000000 --- a/roles/apache/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- - php: false diff --git a/roles/apache/tasks/main.yaml b/roles/apache/tasks/main.yaml deleted file mode 100644 index c6dc758..0000000 --- a/roles/apache/tasks/main.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- include: service.yaml - vars: - service_name: apache2 - service_packages: - - apache2 -- name: validate apache2 configuration - command: nginx -t -c /etc/nginx/nginx.conf - changed_when: False - -- name: enable apache configuration - file: - src: "/etc/apache2/sites-available/{{ config_name }}" - dest: "/etc/apache2/sites-enabled/{{ config_name }}" - state: link - notify: restart apache2 diff --git a/roles/dokuwiki/meta/main.yaml b/roles/dokuwiki/meta/main.yaml index 8b662c9..124178b 100644 --- a/roles/dokuwiki/meta/main.yaml +++ b/roles/dokuwiki/meta/main.yaml @@ -1,3 +1,4 @@ --- dependencies: - role: nginx + php: true diff --git a/roles/dokuwiki/tasks/main.yaml b/roles/dokuwiki/tasks/main.yaml index 13f6b6d..fed8342 100644 --- a/roles/dokuwiki/tasks/main.yaml +++ b/roles/dokuwiki/tasks/main.yaml @@ -5,7 +5,7 @@ - dokuwiki - name: add nginx config for docukiwi template: - src: docukiwi_nginx.j2 + src: docuwiki_nginx.j2 dest: "/etc/nginx/sites-available/{{ config_name }}" notify: - enable nginx configuration diff --git a/roles/dokuwiki/templates/docuwiki_nginx.j2 b/roles/dokuwiki/templates/docuwiki_nginx.j2 index ed55bc3..14077d9 100644 --- a/roles/dokuwiki/templates/docuwiki_nginx.j2 +++ b/roles/dokuwiki/templates/docuwiki_nginx.j2 @@ -1,24 +1,13 @@ server { listen 80; - listen [::]:80; - server_name wiki.domain.example; - return 301 https://$server_name$request_uri; -} - -server { - listen [::]:443 ssl; - listen 443 ssl; - - server_name wiki.domain.example; client_max_body_size 4M; client_body_buffer_size 128k; - root /dokuwiki; + root /usr/share/dokuwiki; index doku.php; location ~ /(data/|conf/|bin/|inc/|install.php) { deny all; } - location / { try_files $uri $uri/ @dokuwiki; } location @dokuwiki { diff --git a/roles/dokuwiki/templates/docuwiki_nginx.j2.TODO b/roles/dokuwiki/templates/docuwiki_nginx.j2.TODO new file mode 100644 index 0000000..7724a37 --- /dev/null +++ b/roles/dokuwiki/templates/docuwiki_nginx.j2.TODO @@ -0,0 +1,36 @@ +server { + listen 80; + listen [::]:80; + server_name wiki.domain.example; + return 301 https://$server_name$request_uri; +} + +server { + listen [::]:443 ssl; + listen 443 ssl; + + client_max_body_size 4M; + client_body_buffer_size 128k; + + root /usr/share/dokuwiki; + index doku.php; + + location ~ /(data/|conf/|bin/|inc/|install.php) { deny all; } + + location / { try_files $uri $uri/ @dokuwiki; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1&$args last; + } + + location ~ \.php$ { + try_files $uri $uri/ /doku.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param REDIRECT_STATUS 200; + fastcgi_pass unix:/var/run/php5-fpm.sock; + } +} diff --git a/roles/lxc_guest/tasks/main.yaml b/roles/lxc_guest/tasks/main.yaml index 45a70b6..6c21d98 100644 --- a/roles/lxc_guest/tasks/main.yaml +++ b/roles/lxc_guest/tasks/main.yaml @@ -91,7 +91,6 @@ - name: set pub key shell: lxc-attach -n {{ vm_name }} --clear-env -e -- bash -c "echo '{{ cert_key.result }}' > /etc/ssh/ssh_host_ed25519_key-cert.pub" register: set_pub_key - notify: restart-container when: "cert_key_existance.rc != 0" - name: update container network configuration diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index 49210a8..51b64ed 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -1,2 +1,3 @@ --- is_proxy: false + php: false diff --git a/roles/nginx/handlers/main.yaml b/roles/nginx/handlers/main.yaml index f1c6884..2152b70 100644 --- a/roles/nginx/handlers/main.yaml +++ b/roles/nginx/handlers/main.yaml @@ -1,5 +1,6 @@ --- - include: service.yaml + # static: yes # see static include issue: https://github.com/ansible/ansible/issues/13485 vars: service_name: nginx @@ -12,4 +13,4 @@ src: "/etc/nginx/sites-available/{{ config_name }}" dest: "/etc/nginx/sites-enabled/{{ config_name }}" state: link - notify: restart nginx + # notify: restart nginx diff --git a/roles/nginx/tasks/main.yaml b/roles/nginx/tasks/main.yaml index 63ce2f3..53081da 100644 --- a/roles/nginx/tasks/main.yaml +++ b/roles/nginx/tasks/main.yaml @@ -1,12 +1,23 @@ --- - include: service.yaml + # static: yes # see static include issue: https://github.com/ansible/ansible/issues/13485 vars: service_name: nginx service_packages: - nginx + - name: disable nginx default configuration file: path=/etc/nginx/sites-enabled/default state=absent notify: restart nginx + +- name: install php5-fpm + apt: name={{ item }} state=latest + with_items: + - php5-fpm + when: php | bool + notify: + - restart nginx + - name: upload nginx proxy configuration template: src: proxy_nginx.j2 diff --git a/roles/roundcube/tasks/main.yaml b/roles/roundcube/tasks/main.yaml index 16c0225..c04552d 100644 --- a/roles/roundcube/tasks/main.yaml +++ b/roles/roundcube/tasks/main.yaml @@ -1,5 +1,5 @@ - name: add jessie-backports repository -- apt_repository: repo='deb http://ftp.debian.org/debian jessie-backports main' state=present + apt_repository: repo='deb http://ftp.debian.org/debian jessie-backports main' state=present - name: install roundcube packages apt: diff --git a/roles/roundcube/templates/roundcube-config.j2 b/roles/roundcube/templates/roundcube_nginx.j2 similarity index 85% rename from roles/roundcube/templates/roundcube-config.j2 rename to roles/roundcube/templates/roundcube_nginx.j2 index e5d1930..08e68e8 100644 --- a/roles/roundcube/templates/roundcube-config.j2 +++ b/roles/roundcube/templates/roundcube_nginx.j2 @@ -1,7 +1,6 @@ server { - listen 80 default_server; - server_name localhost:80; - + listen 80; + # support roundcubemail secure urls rewrite "^/[a-zA-Z0-9]{16}/(.*)" /$1; diff --git a/roles/sympa/tasks/main.yaml b/roles/sympa/tasks/main.yaml index dd02096..52c2d15 100644 --- a/roles/sympa/tasks/main.yaml +++ b/roles/sympa/tasks/main.yaml @@ -1,9 +1,4 @@ --- -- include: service.yaml - vars: - service_name: nginx - service_packages: - - nginx - name: install sympa and associated packages apt: name={{ item }} state=latest with_items: diff --git a/tasks/service.yaml b/tasks/service.yaml index 531f4b7..22056b1 100644 --- a/tasks/service.yaml +++ b/tasks/service.yaml @@ -1,6 +1,6 @@ --- -- name: install "{{ service_name }}" +- name: install {{ service_name }} apt: name="{{ item }}" state=present with_items: "{{ service_packages }}" -- name: start "{{ service_name }}" at boot - service: name="{{ service_name }}" state=started enabled=yes +- name: start {{ service_name }} at boot + service: name="{{ service_name }}" enabled=yes diff --git a/wiki_server.yaml b/wiki.yaml similarity index 84% rename from wiki_server.yaml rename to wiki.yaml index 56e0506..0ab55c9 100644 --- a/wiki_server.yaml +++ b/wiki.yaml @@ -1,5 +1,5 @@ --- -- hosts: lilikhost +- hosts: biff roles: - role: lxc_guest vm_name: wiki