From c8504973a86fa147f21c7e0a1e2a4c7a3d1afcd3 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 2 May 2020 18:00:09 +0200 Subject: [PATCH] Working FramaDate --- network.yml | 1 + roles/framadate/tasks/main.yml | 5 +++++ services_web.yml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/network.yml b/network.yml index a6ec7a1c..16865b78 100755 --- a/network.yml +++ b/network.yml @@ -100,6 +100,7 @@ - {from: autoconfig.crans.org, to: 10.231.136.46} - {from: grafana.crans.org, to: 10.231.136.102} - {from: webirc.crans.org, to: "10.231.136.1:9000"} + - {from: framadate.crans.org, to: 185.230.79.194} # Zamok - {from: install-party.crans.org, to: 10.231.136.1} diff --git a/roles/framadate/tasks/main.yml b/roles/framadate/tasks/main.yml index 507b86e2..4c39e3d5 100644 --- a/roles/framadate/tasks/main.yml +++ b/roles/framadate/tasks/main.yml @@ -44,6 +44,11 @@ state: touch mode: 0600 +- name: Configure admin password + copy: + content: "{{ framadate.admin_username }}:{{ framadate.admin_password_hash }}\n" + dest: /etc/nginx/.htpasswd + - name: Configure nginx site template: src: nginx-site.j2 diff --git a/services_web.yml b/services_web.yml index 283f4482..4c6f7d78 100755 --- a/services_web.yml +++ b/services_web.yml @@ -11,6 +11,8 @@ repo: https://framagit.org/framasoft/framadate/framadate.git version: "77bf2aaa0c344fd25535e2d0543d9a76bf35b5fd" path: /var/www/framadate + admin_username: framadate + admin_password_hash: "{{ vault_framadate_password_hash }}" roles: - framadate