Simplified ansible layout fixes #6

contrib/ansible/ansible.cfg

@@ -1,3 +0,0 @@
-[defaults]
-roles_path = ./roles
-

contrib/ansible/roles/wifiwithme/handlers/main.yml

@@ -1,5 +0,0 @@
-- name: Restart lighttpd
-  service: name=lighttpd state=restarted
-
-- name: Restart wifiwithme
-  service: name=wifiwithme state=restarted

contrib/ansible/roles/wifiwithme/tasks/main.yml

@@ -1,55 +0,0 @@
-# Role for the wifi-with-me form
-
-- name: Install flask
-  apt: pkg=python-flask state=installed update_cache=yes cache_valid_time=3600
-
-- name: Make install dir
-  file:
-    dest: "{{ wwm_install_dir }}"
-    state: directory
-
-- name: Git clone
-  git:
-    repo: https://github.com/JocelynDelalande/wifi-with-me.git
-    dest: "{{ wwm_install_dir }}"
-  notify: Restart wifiwithme
-
-- name: Unix user
-  user: name="{{ wwm_user }}"
-
-- name: Create db
-  command: "{{ wwm_install_dir }}/backend.py createdb"
-  args:
-    chdir: "{{ wwm_install_dir }}"
-    creates: "{{ wwm_install_dir }}/db.sqlite3"
-
-- name: Files ownership
-  file:
-    dest: "{{ wwm_install_dir }}"
-    owner: "{{ wwm_user }}"
-    recurse: yes
-
-- name: Install init file
-  template:
-    src: init.j2
-    dest: /etc/init.d/wifiwithme
-    group: root
-    owner: root
-    mode: 0755
-  notify: Restart wifiwithme
-
-- name: Enable wifiwithme
-  service: name=wifiwithme enabled=yes state=started
-
-- name: Put lighttpd proxy rule
-  template:
-    src: lighttpd-80-wifiwithme.conf.j2
-    dest: /etc/lighttpd/conf-available/80-wifiwithme.conf
-  notify: Restart lighttpd
-
-- name: Enable lighttpd proxy rule
-  file:
-    src: /etc/lighttpd/conf-available/80-wifiwithme.conf
-    dest: /etc/lighttpd/conf-enabled/80-wifiwithme.conf
-    state: link
-  notify: Restart lighttpd

contrib/ansible/site.yml

@@ -1,8 +0,0 @@
-- hosts: all
-  vars:
-    wwm_install_dir: /var/lib/wifiwithme
-    wwm_user: wifiwithme
-    wwm_hostname: wifiwithme.localhost
-    wwm_folder: "/"
-  roles:
-    - wifiwithme

contrib/ansible/wifiwithme.yml

@@ -0,0 +1,67 @@
+- hosts: all
+  vars:
+    wwm_install_dir: /var/lib/wifiwithme
+    wwm_user: wifiwithme
+    wwm_hostname: wifiwithme.localhost
+    wwm_folder: "/"
+
+  tasks:
+    - name: Install flask
+      apt: pkg=python-flask state=installed update_cache=yes cache_valid_time=3600
+    - name: Make install dir
+      file:
+        dest: "{{ wwm_install_dir }}"
+        state: directory
+
+    - name: Git clone
+      git:
+        repo: https://github.com/JocelynDelalande/wifi-with-me.git
+        dest: "{{ wwm_install_dir }}"
+      notify: Restart wifiwithme
+
+    - name: Unix user
+      user: name="{{ wwm_user }}"
+
+    - name: Create db
+      command: "{{ wwm_install_dir }}/backend.py createdb"
+      args:
+        chdir: "{{ wwm_install_dir }}"
+        creates: "{{ wwm_install_dir }}/db.sqlite3"
+
+    - name: Files ownership
+      file:
+        dest: "{{ wwm_install_dir }}"
+        owner: "{{ wwm_user }}"
+        recurse: yes
+
+    - name: Install init file
+      template:
+        src: templates/init.j2
+        dest: /etc/init.d/wifiwithme
+        group: root
+        owner: root
+        mode: 0755
+      notify: Restart wifiwithme
+
+    - name: Enable wifiwithme
+      service: name=wifiwithme enabled=yes state=started
+
+    - name: Put lighttpd proxy rule
+      template:
+        src: templates/lighttpd-80-wifiwithme.conf.j2
+        dest: /etc/lighttpd/conf-available/80-wifiwithme.conf
+      notify: Restart lighttpd
+
+    - name: Enable lighttpd proxy rule
+      file:
+        src: /etc/lighttpd/conf-available/80-wifiwithme.conf
+        dest: /etc/lighttpd/conf-enabled/80-wifiwithme.conf
+        state: link
+      notify: Restart lighttpd
+
+  handlers:
+    - name: Restart lighttpd
+      service: name=lighttpd state=restarted
+
+    - name: Restart wifiwithme
+      service: name=wifiwithme state=restarted