From 44a140d03e881877bc7e309c15c72edc0b2b1fba Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Wed, 1 Jun 2016 16:45:27 +0200 Subject: [PATCH] New "apache2" role The existing "apache2-php5" role has been split up and depends on this new role now. --- roles/apache2-php5/meta/main.yml | 2 +- roles/apache2-php5/tasks/main.yml | 3 --- .../handlers/main.yml | 2 +- roles/apache2/meta/main.yml | 5 ++++ roles/apache2/tasks/main.yml | 25 +++++++++++++++++++ 5 files changed, 32 insertions(+), 5 deletions(-) rename roles/{apache2-php5 => apache2}/handlers/main.yml (77%) create mode 100644 roles/apache2/meta/main.yml create mode 100644 roles/apache2/tasks/main.yml diff --git a/roles/apache2-php5/meta/main.yml b/roles/apache2-php5/meta/main.yml index da6c189..ab46a5c 100644 --- a/roles/apache2-php5/meta/main.yml +++ b/roles/apache2-php5/meta/main.yml @@ -2,4 +2,4 @@ # apache2-php5 meta dependencies: - - { role: os-base } + - { role: apache2 } diff --git a/roles/apache2-php5/tasks/main.yml b/roles/apache2-php5/tasks/main.yml index ff0a48a..d39e17f 100644 --- a/roles/apache2-php5/tasks/main.yml +++ b/roles/apache2-php5/tasks/main.yml @@ -9,9 +9,6 @@ state=installed name={{ item }} with_items: - - apache2-mpm-prefork - - apache2-utils - - apachetop - libapache2-mod-php5 - php-apc - php5 diff --git a/roles/apache2-php5/handlers/main.yml b/roles/apache2/handlers/main.yml similarity index 77% rename from roles/apache2-php5/handlers/main.yml rename to roles/apache2/handlers/main.yml index 00b3e58..680a4c8 100644 --- a/roles/apache2-php5/handlers/main.yml +++ b/roles/apache2/handlers/main.yml @@ -1,5 +1,5 @@ --- -# apache2-php5 handlers +# apache2 handlers - name: restart "apache2" service: > diff --git a/roles/apache2/meta/main.yml b/roles/apache2/meta/main.yml new file mode 100644 index 0000000..433d651 --- /dev/null +++ b/roles/apache2/meta/main.yml @@ -0,0 +1,5 @@ +--- +# apache2 meta + +dependencies: + - { role: os-base } diff --git a/roles/apache2/tasks/main.yml b/roles/apache2/tasks/main.yml new file mode 100644 index 0000000..61a421a --- /dev/null +++ b/roles/apache2/tasks/main.yml @@ -0,0 +1,25 @@ +--- +# apache2 tasks + +- name: install packages for Apache 2 + tags: + - apache + - packages + apt: > + state=installed + name={{ item }} + with_items: + - apache2-mpm-prefork + - apache2-utils + - apachetop + notify: + - restart "apache2" + +- name: ensure service "apache2" is enabled and running + tags: + - apache + - services + service: > + enabled=yes + name=apache2 + state=running -- 2.39.2