majic-ansible-roles Changeset

Changeset - 9fa438ee34c0

Parent rev.

Child rev.

[Not reviewed]

0 4 2

Branko Majic (branko) - 9 years ago 2015-05-29 18:08:54
branko@majic.rs

MAR-5: Added another example to role reference for running PHP websites. Allow duplicates of roles php_website and wsgi_website. Use parameter in handler for restarting WSGI website (to have them website-specific). Updated test site to force handler execution in order to avoid being in undefined state.

6 files changed with 21 insertions and 7 deletions:

docs/rolereference.rst

roles/php_website/meta/main.yml

roles/wsgi_website/handlers/main.yml

roles/wsgi_website/meta/main.yml

roles/wsgi_website/tasks/main.yml

testsite/ansible.cfg

0 comments (0 inline, 0 general)

docs/rolereference.rst

➞

Show inline comments

@@ @@ -985,52 +985,59 @@ Parameters @@
 **packages** (list, optional)
   A list of additional packages to install for this particular PHP
   appliction. This is usually going to be different PHP extensions.
 **uid** (integer, mandatory)
   UID/GID (they are set-up to be the same) of the dedicated website
   user/group.
 Examples
 ~~~~~~~~
 Here is an example configuration for setting-up a (base) PHP website (for running
 ``ownCloud`` application):
 Here is an example configuration for setting-up two (base) PHP websites (for
 running *ownCloud* and *The Bug Genie* applications):
 .. code-block:: yaml
     ---
     - role: php_website
       fqdn: cloud.example.com
       uid: 2001
       admin: admin
       php_file_regex: \.php($|/)
       rewrites:
         - ^/\.well-known/host-meta /public.php?service=host-meta
         - ^/\.well-known/host-meta\.json /public.php?service=host-meta-json
         - ^/\.well-known/carddav /remote.php/carddav/ redirect
         - ^/\.well-known/caldav /remote.php/caldav/ redirect
         - ^/apps/calendar/caldav\.php /remote.php/caldav/
         - ^/apps/contacts/carddav\.php /remote.php/carddav/
         - ^/remote/(.*) /remote.php
       deny_files_regex:
         - ^(\.|autotest|occ|issue|indie|db_|console|build/|tests/|config/|lib/|3rdparty/|templates/).*
       packages:
         # For ownCloud
         - php5-gd
         - php5-json
         - php5-mysql
         - php5-curl
     - role: php_website
       admin: admin
       deny_files_regex:
         - ^\..*
       php_rewrite_urls:
         - ^(.*) /index.php?url=$1
       fqdn: tbg.example.com
       uid: 2007
 WSGI Website
 ------------
 The ``wsgi_website`` role can be used for setting-up a website powered by Python
 on destination machine. The website needs to use the WSGI specification for
 making the Python web application(s) available.
 This role is normally not supposed to be used directly, but should instead serve
 as the basis for writing website-specific roles. Therefore the role is written
 in quite generic way, allowing the integrator to write his/her own logic for

roles/php_website/meta/main.yml

➞

Show inline comments

		new file 100644
		---

		allow_duplicates: yes
		\ No newline at end of file

roles/wsgi_website/handlers/main.yml

➞

Show inline comments

 ---
 - name: Restart website
+- name: "Restart website {{ fqdn }}"
   service: name="{{ fqdn }}" state=restarted

roles/wsgi_website/meta/main.yml

➞

Show inline comments

		new file 100644
		---

		allow_duplicates: yes
		\ No newline at end of file

roles/wsgi_website/tasks/main.yml

➞

Show inline comments

@@ @@ -56,32 +56,32 @@ @@
   pip: name=gunicorn state=present virtualenv="{{ home }}/virtualenv"
 - name: Install additional packages in Python virtual environment
   sudo_user: "{{ admin }}"
   pip: name="{{ item }}" state=present virtualenv="{{ home }}/virtualenv"
   with_items: virtualenv_packages
 - name: Deploy systemd socket configuration for website
   template: src="systemd_wsgi_website.socket.j2" dest="/etc/systemd/system/{{ fqdn }}.socket"
             owner=root group=root mode=644
   notify:
     - Reload systemd
     - Restart website
+    - "Restart website {{ fqdn }}"
 - name: Deploy systemd service configuration for website
   template: src="systemd_wsgi_website.service.j2" dest="/etc/systemd/system/{{ fqdn }}.service"
             owner=root group=root mode=644
   notify:
     - Reload systemd
     - Restart website
+    - "Restart website {{ fqdn }}"
 - name: Enable the website service
   service: name="{{ fqdn }}" enabled=yes state=started
 - name: Create directory where static files can be served from
   file: path="{{ home }}/htdocs/" state=directory
         owner="{{ admin }}" group="{{ user }}" mode="2750"
 - name: Deploy nginx configuration file for website
   template: src="nginx_site.j2" dest="/etc/nginx/sites-available/{{ fqdn }}"
             owner=root group=root mode=640 validate="/usr/local/bin/nginx_verify_site.sh -n '{{ fqdn }}' %s"
   notify:

testsite/ansible.cfg

➞

Show inline comments

 [defaults]
 roles_path=../roles
 force_handlers = True
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)