1 files changed, 35 insertions, 17 deletions
diff --git a/roles/effi-reg/tasks/main.yml b/roles/effi-reg/tasks/main.yml
index 787e360..4553a39 100644
--- a/roles/effi-reg/tasks/main.yml
+++ b/roles/effi-reg/tasks/main.yml
@@ -1,32 +1,41 @@
-- name: "create _effiapi group"
+- name: "create groups"
   group:
-    name: _effiapi
+    name: "{{ item }}"
+  with_items:
+    - _effiapi
+    - _effireg
 
-- name: "create _effiapi user"
+- name: "create users"
   user:
-    name: _effiapi
+    name: "{{ item }}"
     groups:
-      - _effiapi
+      - "{{ item }}"
     shell: /bin/false
+  with_items:
+    - _effiapi
+    - _effireg
 
 - name: "create directory for effi-reg source"
   file:
     state: directory
     path: "/srv/effireg"
 
-- name: "create log directory for effi-reg"
+- name: "create log directories"
   file:
     state: directory
-    path: "/var/log/effiapi"
-    owner: _effiapi
-    group: _effiapi
+    path: "/var/log/{{ item }}"
+    owner: "_{{ item }}"
+    group: "_{{ item }}"
     mode: 0755
+  with_items:
+    - effiapi
+    - effireg
 
 - name: "install git"
   apt:
     name: git
 
-- name: "deploy effi-reg from git"
+- name: "deploy from git"
   git:
     repo: "git://git.liw.fi/effi-reg"
     dest: "/srv/effireg"
@@ -36,20 +45,29 @@
     content: "{{ qvisqve_token_public_key }}"
     dest: "/etc/effiapi.pub"
 
-- name: "install effi-reg configuration"
+- name: "install configuration files"
   copy:
-    src: effiapi.json
-    dest: /etc/effiapi.json
+    src: "{{ item }}.json"
+    dest: "/etc/{{ item }}.json"
+  with_items:
+    - effiapi
+    - effireg
 
-- name: "install effiapi.service file"
+- name: "install .service files"
   copy:
     remote_src: yes
-    src: /srv/effireg/effiapi.service
+    src: "/srv/effireg/{{ item }}.service"
     dest: /lib/systemd/system
+  with_items:
+    - effiapi
+    - effireg
 
-- name: "start effiapi"
+- name: "(re)start services"
   systemd:
-    name: effiapi
+    name: "{{ item }}"
     enabled: yes
     state: restarted
     daemon_reload: yes
+  with_items:
+    - effiapi
+    - effireg