o sz-ds: wip.

1 files changed, 17 insertions, 50 deletions

diff --git a/ansible/roles/sz-ds/tasks/main.yml b/ansible/roles/sz-ds/tasks/main.yml
index 9e55292..559937c 100644
--- a/ansible/roles/sz-ds/tasks/main.yml
+++ b/ansible/roles/sz-ds/tasks/main.yml
@@ -4,8 +4,10 @@
     name: "{{ item }}"
     install_recommends: no
   with_items:
+    - git
     - python-psycopg2
     - python3-psycopg2
+    - virtualenv
 
 - name: accounts for sz-ds
   tags: user
@@ -17,12 +19,18 @@
         createhome: no
         home: /opt/sz-ds
         system: yes
-    - file:
+    - name: mkdir /etc/sz-ds
+      file:
+        state: directory
+        path: /etc/sz-ds
+    - name: mkdir /opt/sz-ds
+      file:
         state: directory
         path: /opt/sz-ds
         owner: sz-ds
         mode: u=rwx,go=
-    - file:
+    - name: mkdir /opt/sz-ds/bin
+      file:
         state: directory
         path: /opt/sz-ds/bin
     - copy:
@@ -31,57 +39,16 @@
 
 - name: flyway for sz-ds
   tags: flyway
-  block:
-    - name: mkdir /opt/sz-ds/flyway
-      file:
-        state: directory
-        path: /opt/sz-ds/flyway
-    - template:
-        src: opt/sz-ds/bin/flyway.j2
-        dest: /opt/sz-ds/bin/flyway
-        mode: a=rx
-    - name: Download and extract Flyway {{ flyway_version }}
-      unarchive:
-        src: "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/{{ flyway_version }}/flyway-commandline-{{ flyway_version }}.zip"
-        dest: /opt/sz-ds/flyway
-        creates: "/opt/sz-ds/flyway/flyway-{{ flyway_version }}"
-        remote_src: yes
-    - file:
-        path: "/opt/sz-ds/flyway/flyway-{{ flyway_version }}/flyway"
-        mode: a=rx
-    # flyway.conf is created later
+  include: flyway.yml
+
 - name: sz-ds database
   tags: sz-ds-pg
   become: yes
   become_user: postgres
   vars:
     ansible_ssh_pipelining: true
-  block:
-    - name: sz-ds
-      postgresql_user:
-        name: sz-ds
-        role_attr_flags: "NOLOGIN"
-    - name: sz-ds-flyway
-      tags: update-password
-      postgresql_user:
-        name: sz-ds-flyway
-        password: "{{ sz_ds_secret.db_password_flyway }}"
-        encrypted: yes
-    - name: sz-ds-web
-      tags: update-password
-      postgresql_user:
-        name: sz-ds-web
-        password: "{{ sz_ds_secret.db_password_web }}"
-        encrypted: yes
-    - name: sz-ds db
-      postgresql_db:
-        name: "sz-ds"
-        encoding: "utf-8"
-        owner: "sz-ds"
-    - postgresql_privs:
-        database: sz-ds
-        state: present
-        privs: USAGE
-        type: schema
-        objs: public
-        roles: sz-ds-web,sz-ds-flyway
+  include: sz-ds-pg.yml
+
+- name: sz-ds app
+  tags: sz-ds-app
+  include: sz-ds-app.yml