diff --git a/ansible/base.yml b/ansible/base.yml index a9e5e297..1212382b 100755 --- a/ansible/base.yml +++ b/ansible/base.yml @@ -1,9 +1,10 @@ #!/usr/bin/env ansible-playbook --- -- hosts: bde-nk20-beta.adh.crans.org +- hosts: dt.adh.crans.org roles: - 1-apt-basic - 2-nk20 - 3-pip - 4-nginx + - 5-psql diff --git a/ansible/hosts b/ansible/hosts index beafcc55..5bbbdf69 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -1,5 +1,5 @@ [server] -bde-nk20-beta.adh.crans.org +dt.adh.crans.org [all:vars] ansible_python_interpreter=/usr/bin/python3 diff --git a/ansible/roles/2-nk20/tasks/main.yml b/ansible/roles/2-nk20/tasks/main.yml index 8211444d..b45308a8 100644 --- a/ansible/roles/2-nk20/tasks/main.yml +++ b/ansible/roles/2-nk20/tasks/main.yml @@ -13,6 +13,7 @@ dest: /var/www/note_kfet version: beta-soon track_submodules: yes + force: true - name: Update permissions for note_kfet dir file: diff --git a/ansible/roles/3-pip/tasks/main.yml b/ansible/roles/3-pip/tasks/main.yml index 10b45a76..cbc3e902 100644 --- a/ansible/roles/3-pip/tasks/main.yml +++ b/ansible/roles/3-pip/tasks/main.yml @@ -4,9 +4,11 @@ requirements: /var/www/note_kfet/requirements/base.txt virtualenv: /var/www/note_kfet/env virtualenv_command: /usr/bin/python3 -m venv + become_user: www-data - name: Install PIP production dependencies pip: requirements: /var/www/note_kfet/requirements/production.txt virtualenv: /var/www/note_kfet/env virtualenv_command: /usr/bin/python3 -m venv + become_user: www-data diff --git a/ansible/roles/4-nginx/tasks/main.yml b/ansible/roles/4-nginx/tasks/main.yml index 4e8a9b50..807a84e1 100644 --- a/ansible/roles/4-nginx/tasks/main.yml +++ b/ansible/roles/4-nginx/tasks/main.yml @@ -19,3 +19,13 @@ src: /var/www/note_kfet/uwsgi_note.ini dest: /etc/uwsgi/apps-enabled/uwsgi_note.ini state: link + +- name: Reload Nginx + systemd: + name: nginx + state: reloaded + +- name: Restart UWSGI + systemd: + name: uwsgi + state: restarted diff --git a/ansible/roles/5-psql/tasks/main.yml b/ansible/roles/5-psql/tasks/main.yml new file mode 100644 index 00000000..972164e5 --- /dev/null +++ b/ansible/roles/5-psql/tasks/main.yml @@ -0,0 +1,27 @@ +--- +- name: Install PostgreSQL APT packages + apt: + update_cache: true + name: + - postgresql + - postgresql-contrib + - libpq-dev + register: pkg_result + retries: 3 + until: pkg_result is succeeded + +- name: Install Psycopg2 + pip: + name: psycopg2-binary + +- name: Create role note + postgresql_user: + name: note + password: note # Fix it! + become_user: postgres + +- name: Create NK20 database + postgresql_db: + name: note_db + owner: note + become_user: postgres