Merge pull request #836 from edx/cg/apache_cleanup

Updates to apache role to make it more flexible and inline with nginx

playbooks/roles/apache/defaults/main.yml

 ---
-apache_port: 80
+apache_ports: 
+  - 80
+apache_sites:
+  - lms
+apache_template_dir: '.'

playbooks/roles/apache/handlers/main.yml

 ---
 - name: restart apache
   service: name=apache2 state=restarted
+  tags: deploy

playbooks/roles/apache/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/apache/tasks/apache_site.yml

-# Requires nginx package
----
-- name: Copying apache config {{ site_name }}
-  template: src={{ item }} dest=/etc/apache2/sites-available/{{ site_name }}
-  first_available_file:
-    - "{{ local_dir }}/apache/templates/{{ site_name }}.j2"
-    # seems like paths in first_available_file must be relative to the playbooks dir
-    - "roles/apache/templates/{{ site_name }}.j2"
-  notify: restart apache
-  when: apache_role_run is defined
-  tags:
-    - apache
-    - update
-
-- name: Creating apache2 config link {{ site_name }}
-  file: src=/etc/apache2/sites-available/{{ site_name }} dest=/etc/apache2/sites-enabled/{{ site_name }} state={{ state }} owner=root group=root
-  notify: restart apache
-  when: apache_role_run is defined
-  tags:
-    - apache
-    - update

playbooks/roles/apache/tasks/main.yml

-#Installs apache and runs the lms wsgi
+# Installs apache and runs the lms wsgi by default
 ---
 
 - name: Installs apache and mod_wsgi from apt
@@ -7,30 +7,29 @@
     - apache2
     - libapache2-mod-wsgi
   notify: restart apache
-  tags:
-    - apache
-    - install
-
+    
 - name: disables default site
   command: a2dissite 000-default
   notify: restart apache
-  tags:
-    - apache
-    - install
-
+    
 - name: rewrite apache ports conf
   template: dest=/etc/apache2/ports.conf src=ports.conf.j2 owner=root group=root
   notify: restart apache
-  tags:
-    - apache
-    - install
 
-- name: Register the fact that apache role has run
-  command: echo True
-  register: apache_role_run
-  tags:
-    - apache
-    - install
+- debug: msg={{ apache_sites }}
 
+- name: Copying apache configs for {{ apache_sites }}
+  template: >
+    src={{ apache_template_dir }}/{{ item }}.j2
+    dest=/etc/apache2/sites-available/{{ item }}
+    owner=root group={{ common_web_user }} mode=0640
+  notify: restart apache
+  with_items: apache_sites
 
-- include: apache_site.yml state=link site_name=lms
+- name: Creating apache2 config links for {{ apache_sites }}
+  file: >
+    src=/etc/apache2/sites-available/{{ item  }}
+    dest=/etc/apache2/sites-enabled/{{ item }}
+    state=link owner=root group=root
+  notify: restart apache
+  with_items: apache_sites

playbooks/roles/apache/templates/ports.conf.j2

-NameVirtualHost *:{{ apache_port }}
-Listen {{ apache_port }}
+{%- for port in apache_ports -%}
+NameVirtualHost *:{{ port }}
+Listen {{ port }}
+{% endfor %}