diff --git a/ansible/base.yml b/ansible/base.yml index d3845f27008e8f15f46e4c478253be140b057310..6e455581493fe71da5a4f68bba9436ff368aefdc 100755 --- a/ansible/base.yml +++ b/ansible/base.yml @@ -2,6 +2,10 @@ --- - hosts: bde-nk20-beta.adh.crans.org + vars_prompt: + - name: DB_PASSWORD + prompt: "Password of the database" + private: yes roles: - 1-apt-basic - 2-nk20 diff --git a/ansible/roles/6-psql/tasks/main.yml b/ansible/roles/6-psql/tasks/main.yml index ba313ee1eac9e53f0ad9be710fd031ce0cf1312f..90ed8096e789f38f9452249ef96d0df66cd2db7a 100644 --- a/ansible/roles/6-psql/tasks/main.yml +++ b/ansible/roles/6-psql/tasks/main.yml @@ -17,7 +17,7 @@ - name: Create role note postgresql_user: name: note - password: "CHANGE_ME" + password: "{{ DB_PASSWORD }}" become_user: postgres - name: Create NK20 database diff --git a/ansible/roles/7-postinstall/tasks/main.yml b/ansible/roles/7-postinstall/tasks/main.yml index b1615a0b4007d6807dc23bfb77ad044094a052fc..34a9011bcc98c4b8052d3bf46c3528f7b080a695 100644 --- a/ansible/roles/7-postinstall/tasks/main.yml +++ b/ansible/roles/7-postinstall/tasks/main.yml @@ -9,7 +9,7 @@ command: /var/www/note_kfet/env/bin/python manage.py migrate args: chdir: /var/www/note_kfet - become_user: www-data + become_user: postgres - name: Compile messages command: /var/www/note_kfet/env/bin/python manage.py compilemessages @@ -21,4 +21,4 @@ command: /var/www/note_kfet/env/bin/python manage.py loaddata initial args: chdir: /var/www/note_kfet - become_user: www-data + become_user: postgres diff --git a/apps/scripts b/apps/scripts index dd8b48c31d4501d95b3afb00ac9b387397fca957..e16629cc70c155e4d32244f80684295b459a8a59 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit dd8b48c31d4501d95b3afb00ac9b387397fca957 +Subproject commit e16629cc70c155e4d32244f80684295b459a8a59