renamed repository

weareinteractive · Aug 16, 2014 · 57def7a · 57def7a
1 parent d6c72d8
commit 57def7a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 81 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,6 @@ install:
   - ansible-galaxy install franklinkim.openssl
 script:
   - echo localhost > inventory
-  - ln -s ansible-role-apache2 ../franklinkim.apache2
+  - ln -s ansible-apache2 ../franklinkim.apache2
   - ansible-playbook --syntax-check -i inventory test.yml
   - ansible-playbook -i inventory test.yml --connection=local --sudo -vvvv
diff --git a/README.md b/README.md
@@ -1,13 +1,12 @@
 # Ansible Apache2 Role
 
-[![Build Status](https://travis-ci.org/weareinteractive/ansible-role-apache2.png?branch=master)](https://travis-ci.org/weareinteractive/ansible-role-apache2)
-[![Stories in Ready](https://badge.waffle.io/weareinteractive/ansible-role-apache2.svg?label=ready&title=Ready)](http://waffle.io/weareinteractive/ansible-role-apache2)
+[![Build Status](https://travis-ci.org/weareinteractive/ansible-apache2.png?branch=master)](https://travis-ci.org/weareinteractive/ansible-apache2)
+[![Stories in Ready](https://badge.waffle.io/weareinteractive/ansible-apache2.svg?label=ready&title=Ready)](http://waffle.io/weareinteractive/ansible-apache2)
 
 > `apache2` is an [ansible](http://www.ansible.com) role which: 
 > 
 > * installs apache2
 > * configures apache2
-> * configures `/var/www`
 > * enables/disables confs
 > * enables/disables sites
 > * enables/disables modules
@@ -30,7 +29,7 @@ $ arm install franklinkim.apache2
 Using `git`:
 
 ```
-$ git clone https://github.com/weareinteractive/ansible-role-apache2.git
+$ git clone https://github.com/weareinteractive/ansible-apache2.git
 ```
 
 ## Variables
@@ -57,12 +56,6 @@ apache2_modules: []
 apache2_confs: []
 # enabled/disabled sites
 apache2_sites: []
-# www dir owner name
-apache2_wwww_dir_owner: root
-# www dir group name
-apache2_wwww_dir_group: root
-# www dir mode
-apache2_wwww_dir_mode: 0775
 # remove the default host
 apache2_remove_default: yes
 # start on boot
@@ -71,6 +64,11 @@ apache2_service_enabled: yes
 apache2_service_state: started
 ```
 
+## Handlers
+
+* `reload apache2` 
+* `restart apache2` 
+
 ## Example playbook
 
 ```
@@ -87,15 +85,13 @@ apache2_service_state: started
       - { id: mime, state: present }
       - { id: headers, state: present }
       - { id: rewrite, state: present }
-    apache2_wwww_dir_group: staff
-    apache2_wwww_dir_mode: 4775
 ```
 
 ## Testing
 
 ```
-$ git clone https://github.com/weareinteractive/ansible-role-apache2.git
-$ cd ansible-role-apache2
+$ git clone https://github.com/weareinteractive/ansible-apache2.git
+$ cd ansible-apache2
 $ vagrant up
 ```
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -23,12 +23,6 @@ apache2_modules: []
 apache2_confs: []
 # enabled/disabled sites
 apache2_sites: []
-# www dir owner name
-apache2_wwww_dir_owner: root
-# www dir group name
-apache2_wwww_dir_group: root
-# www dir mode
-apache2_wwww_dir_mode: 0775
 # remove the default host
 apache2_remove_default: yes
 # start on boot

diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -35,13 +35,3 @@
     - web
     - apache2
 
-- name: Setting file permissions
-  file: >
-    path=/var/www
-    state=directory
-    owner={{ apache2_wwww_dir_owner }}
-    group={{ apache2_wwww_dir_group }}
-    mode={{ apache2_wwww_dir_mode }}
-  tags:
-    - web
-    - apache2
diff --git a/tasks/install.yml b/tasks/install.yml
@@ -9,5 +9,3 @@
   tags:
     - web
     - apache2
-
-
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -4,7 +4,6 @@
 - include: configure.yml
 - include: rules.yml
 - include: remove_default.yml
-  when: apache2_remove_default
 - include: manage_confs.yml
 - include: manage_sites.yml
 - include: manage_modules.yml

diff --git a/tasks/manage_sites.yml b/tasks/manage_sites.yml
@@ -4,7 +4,7 @@
   command: >
     a2ensite {{ item.id }}
     creates=/etc/apache2/sites-enabled/{{ item.id }}.conf
-  when: item.state is not defined or item.state != 'absent'
+  when: item.state is not defined or item.state == 'present'
   with_items: apache2_sites
   notify: reload apache2
   tags:

diff --git a/tasks/remove_default.yml b/tasks/remove_default.yml
@@ -1,18 +1,11 @@
 ---
 
-- name: Removing default files
-  file: >
-    dest=/var/www/html
-    state=absent
-  tags:
-    - web
-    - apache2
-
 - name: Disabling default host
   file: >
     dest=/etc/apache2/sites-enabled/000-default.conf
     state=absent
   notify: reload apache2
+  when: apache2_remove_default
   tags:
     - web
     - apache2
@@ -21,6 +14,7 @@
   file: >
     dest=/etc/apache2/sites-available/000-default.conf
     state=absent
+  when: apache2_remove_default
   tags:
     - web
     - apache2
@@ -29,6 +23,7 @@
   file: >
     dest=/etc/apache2/sites-available/default-ssl.conf
     state=absent
+  when: apache2_remove_default
   tags:
     - web
     - apache2
diff --git a/templates/etc-apache2-sites-available-default.j2 b/templates/etc-apache2-sites-available-default.j2