New "apache2" role

The existing "apache2-php5" role has been split up and depends on
this new role now.

diff --git a/roles/apache2-php5/handlers/main.yml b/roles/apache2-php5/handlers/main.yml
deleted file mode 100644 (file)
index 00b3e58..0000000
--- a/roles/apache2-php5/handlers/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# apache2-php5 handlers
-
-- name: restart "apache2"
-  service: >
-    name=apache2
-    state=restarted

diff --git a/roles/apache2-php5/meta/main.yml b/roles/apache2-php5/meta/main.yml
index da6c189e0b8b6e7ef32e6314dd7c6ba82c06d29f..ab46a5c5126519ba7a872f34af375d93cbe524aa 100644 (file)
--- 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 ff0a48ab4b6b84cb725713a755b8b21282925b27..d39e17f39d7d24bc758bb9052c867647a1f68c90 100644 (file)
--- 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/handlers/main.yml b/roles/apache2/handlers/main.yml
new file mode 100644 (file)
index 0000000..680a4c8
--- /dev/null
+++ b/roles/apache2/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+# apache2 handlers
+
+- name: restart "apache2"
+  service: >
+    name=apache2
+    state=restarted

diff --git a/roles/apache2/meta/main.yml b/roles/apache2/meta/main.yml
new file mode 100644 (file)
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 (file)
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