From e4de473fe853796d0b5cb843105f734ac0547e67 Mon Sep 17 00:00:00 2001 From: korenstin Date: Sun, 1 Sep 2024 18:27:51 +0200 Subject: [PATCH 1/4] Modification syntaxe borg et retrait de backup-thot --- group_vars/all/borg.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all/borg.yml b/group_vars/all/borg.yml index fc64d92e..e9142089 100644 --- a/group_vars/all/borg.yml +++ b/group_vars/all/borg.yml @@ -9,8 +9,8 @@ glob_borg: - /backup/borg-server - /backup/borg-adh remote: - - borg@backup-ft.adm.crans.org:/backup/borg-server/{{ ansible_hostname }} - - borg@backup-thot.adm.crans.org:/backup/borg-server/{{ ansible_hostname }} + - ssh://borg@backup-ft.adm.crans.org/backup/borg-server/{{ ansible_hostname }} +# - ssh://borg@backup-thot.adm.crans.org/backup/borg-server/{{ ansible_hostname }} retention: - ["daily", 4] - ["monthly", 6] From 1d777a03abbd77b847da20d7c688dd1d4988f0af Mon Sep 17 00:00:00 2001 From: korenstin Date: Sun, 1 Sep 2024 18:29:55 +0200 Subject: [PATCH 2/4] Ajout configuration eclaircie/nextcloud --- host_vars/eclaircie.adm.crans.org.yml | 16 ++++++++++++++++ host_vars/tealc.adm.crans.org.yml | 1 + 2 files changed, 17 insertions(+) create mode 100644 host_vars/eclaircie.adm.crans.org.yml diff --git a/host_vars/eclaircie.adm.crans.org.yml b/host_vars/eclaircie.adm.crans.org.yml new file mode 100644 index 00000000..9b46ec92 --- /dev/null +++ b/host_vars/eclaircie.adm.crans.org.yml @@ -0,0 +1,16 @@ +--- +interfaces: + adm: ens18 + san: ens19 + srv_nat: ens20 + +loc_unattended: + reboot: true + +loc_needrestart: + override: [] + +loc_ldap: + base_dn: "{{ vault.slapd.re2o.admin.binddn }}" + password: "{{ vault.slapd.re2o.admin.bindpass }}" + uri: "ldap://{{ query('ldap', 'ip4', 'yson-partou', 'adm') }}" diff --git a/host_vars/tealc.adm.crans.org.yml b/host_vars/tealc.adm.crans.org.yml index 8618f5ad..14f6e4ee 100644 --- a/host_vars/tealc.adm.crans.org.yml +++ b/host_vars/tealc.adm.crans.org.yml @@ -21,6 +21,7 @@ loc_postgres: - db: roundcube user: roundcube map: {name: webmail, system: www-data, pg: roundcube} + - {db: nextcloud, user: nextcloud} - {db: owncloud, user: owncloud} - {db: cas, user: cas} - {db: hedgedoc, user: hedgedoc} From e75a9d5ac443ea8e4d7bd398eb8a5f293a3849dc Mon Sep 17 00:00:00 2001 From: korenstin Date: Sun, 1 Sep 2024 18:31:31 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Configuration=20chene/onlyoffice=20(l'insta?= =?UTF-8?q?llation=20d'onlyoffice=20doit=20se=20faire=20=C3=A0=20la=20main?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- group_vars/onlyoffice.yml | 4 ++++ host_vars/tealc.adm.crans.org.yml | 1 + hosts | 3 +++ roles/onlyoffice/handlers/main.yml | 5 +++++ roles/onlyoffice/tasks/main.yml | 8 ++++++++ roles/onlyoffice/templates/nginx/default | 15 +++++++++++++++ 6 files changed, 36 insertions(+) create mode 100644 group_vars/onlyoffice.yml create mode 100644 roles/onlyoffice/handlers/main.yml create mode 100644 roles/onlyoffice/templates/nginx/default diff --git a/group_vars/onlyoffice.yml b/group_vars/onlyoffice.yml new file mode 100644 index 00000000..6a7b69ce --- /dev/null +++ b/group_vars/onlyoffice.yml @@ -0,0 +1,4 @@ +--- +glob_onlyoffice: + server: + port: 8080 diff --git a/host_vars/tealc.adm.crans.org.yml b/host_vars/tealc.adm.crans.org.yml index 14f6e4ee..902a71ac 100644 --- a/host_vars/tealc.adm.crans.org.yml +++ b/host_vars/tealc.adm.crans.org.yml @@ -21,6 +21,7 @@ loc_postgres: - db: roundcube user: roundcube map: {name: webmail, system: www-data, pg: roundcube} + - {db: onlyoffice, user: onlyoffice} - {db: nextcloud, user: nextcloud} - {db: owncloud, user: owncloud} - {db: cas, user: cas} diff --git a/hosts b/hosts index 98babe28..e06db2fa 100644 --- a/hosts +++ b/hosts @@ -165,6 +165,9 @@ wiki [ntp_server] eclat.adm.crans.org +[onlyoffice] +chene.adm.crans.org + [opendkim:children] mailman postfix diff --git a/roles/onlyoffice/handlers/main.yml b/roles/onlyoffice/handlers/main.yml new file mode 100644 index 00000000..2e593d34 --- /dev/null +++ b/roles/onlyoffice/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: Restart nginx + service: + name: nginx + state: restarted diff --git a/roles/onlyoffice/tasks/main.yml b/roles/onlyoffice/tasks/main.yml index 0dff11be..9164d29b 100644 --- a/roles/onlyoffice/tasks/main.yml +++ b/roles/onlyoffice/tasks/main.yml @@ -20,6 +20,7 @@ owner: root group: root +# L'installation de onlyoffice ne marche pas, il faut la faire à la main - name: Install onlyoffice apt: update_cache: true @@ -38,3 +39,10 @@ src: update-motd.d/05-service.j2 dest: /etc/update-motd.d/05-onlyoffice mode: 0755 + +- name: nginx configuration + template: + src: nginx/default + dest: /etc/nginx/sites-available/default + mode: 0755 + notify: Restart nginx diff --git a/roles/onlyoffice/templates/nginx/default b/roles/onlyoffice/templates/nginx/default new file mode 100644 index 00000000..3a919def --- /dev/null +++ b/roles/onlyoffice/templates/nginx/default @@ -0,0 +1,15 @@ +{{ ansible_header | comment }} + +server { + listen 80 default_server; + listen [::]:80 default_server; + + index index.html index.htm index.nginx-debian.html; + + server_name _; + + location / { + proxy_pass "http://localhost:{{ glob_onlyoffice.server.port }}"; + } + +} From 5176eef287782fb6de9c27ea5d494b057c77f46a Mon Sep 17 00:00:00 2001 From: korenstin Date: Sun, 1 Sep 2024 18:59:18 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Mise=20=C3=A0=20jour=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e8455d3..0859ba00 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ cela rendre accessible le LDAP sur votre machine, en ouvrant dans un terminal à côté : ```bash -ssh -L 1636:tealc.adm.crans.org:636 tealc.adm.crans.org +ssh -L 1636:wall-e.adm.crans.org:636 wall-e.adm.crans.org ``` Pour que la connexion puisse fonctionner, vous aurez besoin du paquet