diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 7cc71b4bbd1810a6eb5d32e839b524754cb1bdd3..c50c4d97abe311127956cba7fe7cfc75c1089f4f 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -994,13 +994,11 @@ Parameters 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 @@ -1022,6 +1020,15 @@ Here is an example configuration for setting-up a (base) PHP website (for runnin - 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 diff --git a/roles/php_website/meta/main.yml b/roles/php_website/meta/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..873860b6a732d202899b6ca78b98b93fecdc0a45 --- /dev/null +++ b/roles/php_website/meta/main.yml @@ -0,0 +1,3 @@ +--- + +allow_duplicates: yes \ No newline at end of file diff --git a/roles/wsgi_website/handlers/main.yml b/roles/wsgi_website/handlers/main.yml index 205f7aeda9b6b99b9f7a6d1d6e2765cce994fabc..f77fdad85965854c7cdf5ad642e98f995df5ca7a 100644 --- a/roles/wsgi_website/handlers/main.yml +++ b/roles/wsgi_website/handlers/main.yml @@ -1,4 +1,4 @@ --- -- name: Restart website +- name: "Restart website {{ fqdn }}" service: name="{{ fqdn }}" state=restarted diff --git a/roles/wsgi_website/meta/main.yml b/roles/wsgi_website/meta/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..873860b6a732d202899b6ca78b98b93fecdc0a45 --- /dev/null +++ b/roles/wsgi_website/meta/main.yml @@ -0,0 +1,3 @@ +--- + +allow_duplicates: yes \ No newline at end of file diff --git a/roles/wsgi_website/tasks/main.yml b/roles/wsgi_website/tasks/main.yml index f2f8f2440d6e074bd9ec266b1de91325988ae03e..244d9d92006ce63a9056fb05030480276e91fa6d 100644 --- a/roles/wsgi_website/tasks/main.yml +++ b/roles/wsgi_website/tasks/main.yml @@ -65,14 +65,14 @@ 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 diff --git a/testsite/ansible.cfg b/testsite/ansible.cfg index a6f9273d81318ea2b5a927b186902c01de89d341..33dd42004674301815a2a3187ec1844d54bc689c 100644 --- a/testsite/ansible.cfg +++ b/testsite/ansible.cfg @@ -1,3 +1,4 @@ [defaults] roles_path=../roles +force_handlers = True \ No newline at end of file