From 42ab0c20aa43b39e4bc44e201e99557775d7957e Mon Sep 17 00:00:00 2001
From: nono <np@laquadrature.net>
Date: Tue, 19 Jan 2021 18:43:33 +0100
Subject: [PATCH] Updated the SQL and hedgedocs config accordinly
---
files/config.json.j2 | 8 ++++----
tasks/install-database.yml | 41 +++++++++++++++++++++++++++++---------
2 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/files/config.json.j2 b/files/config.json.j2
index b7139fa..79eb3fb 100644
--- a/files/config.json.j2
+++ b/files/config.json.j2
@@ -36,16 +36,16 @@
},
"cookiePolicy": "strict",
"db": {
- "username": "hedgedocs-user",
- "password": "{{hedgedocs-sql-password}}",
- "database": "hedgedoc",
+ "username": "{{ hedgedoc_db_user }}",
+ "password": "{{ hedgedocs-sql-password }}",
+ "database": "{{ hedgedoc_db_name }}",
"host": "localhost",
"port": "5432",
"dialect": "postgres"
},
"linkifyHeaderStyle": "gfm",
"allowAnonymous" : false,
- "sessionSecret" : ,
+ "sessionSecret" : {{ hedgedoc_session_secret }},
"allowEmailRegister" : false
}
}
diff --git a/tasks/install-database.yml b/tasks/install-database.yml
index 3632a74..f2e3161 100644
--- a/tasks/install-database.yml
+++ b/tasks/install-database.yml
@@ -6,12 +6,35 @@
state: started
enabled: yes
-- name: Creation de l'utilisateur pour pSQL
- community.general.postgresql_user:
- name: hedgedocs-user
- password: "{{ hedgedoc_sql_password }}"
- priv: "ALL" # NB: Est-ce que ce niveau de privilège est nécessire ?
- comment: "Utilisateur pSQL pour le service hedgedocs"
- db: hedgedoc
- state: present
- role_attr_flags: CREATEDB,NOSUPERUSER
+# - name: Creation de l'utilisateur pour pSQL
+# community.general.postgresql_user:
+# name: hedgedocs-user
+# password: "{{ hedgedoc_sql_password }}"
+# priv: "ALL" # NB: Est-ce que ce niveau de privilège est nécessire ?
+# comment: "Utilisateur pSQL pour le service hedgedocs"
+# db: hedgedoc
+# state: present
+# role_attr_flags: CREATEDB,NOSUPERUSER
+
+- name: Creation de la base de donnée
+ sudo_user: postgres
+ postgresql_db: name={{ hedgedoc_db_name }}
+ encoding='UTF-8'
+ lc_collate='en_US.UTF-8'
+ lc_ctype='en_US.UTF-8'
+ template='template0'
+ state=present
+
+- name: Creation de l'accès à la base de donnée
+ sudo_user: postgres
+ postgresql_user: db={{ hedgedoc_db_name }}
+ name={{ hedgedoc_db_user }}
+ password={{ hedgedoc_sql_password }}
+ priv=ALL
+ state=present
+
+- name: Vérification des privilèges sur la base de donnée
+ sudo_user: postgres
+ postgresql_user: name={{ hedgedoc_db_user }}
+ role_attr_flags=NOSUPERUSER,NOCREATEDB
+ state=pr
--
GitLab