diff --git a/all.yml b/all.yml index c7bb4fc4..4579391d 100755 --- a/all.yml +++ b/all.yml @@ -26,7 +26,6 @@ - import_playbook: plays/generate_documentation.yml - import_playbook: plays/gitlab.yml - import_playbook: plays/home.yml -- import_playbook: plays/horde.yml - import_playbook: plays/irc.yml - import_playbook: plays/jitsi.yml - import_playbook: plays/keepalived.yml diff --git a/group_vars/horde.yml b/group_vars/horde.yml deleted file mode 100644 index f6b1d708..00000000 --- a/group_vars/horde.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -glob_horde: - secret: '{{ vault.horde.secret }}' - imap: imap.adm.crans.org - maildomain: crans.org - db: pgsql.adm.crans.org - admins: "{{ vault.horde.admins }}" - redirection: https://wiki.crans.org/VieCrans/PagesDeDeconnexion/ERR_CHOOSE_WEBMAIL - src_hostname: horde.crans.org - dest_hostname: webmail.crans.org - admin_src_hostname: horde.adm.crans.org - admin_dest_hostname: webmail.adm.crans.org - zone_ipv4: 172.16.10.0/24 - zone_ipv6: fd00:0:0:10::/64 - ipv4: "{{ query('ldap', 'ip4', ansible_hostname, 'adm') }}" - ipv6: "{{ query('ldap', 'ip6', ansible_hostname, 'adm') }}" - mailer: - host: redisdead.adm.crans.org diff --git a/group_vars/reverseproxy.yml b/group_vars/reverseproxy.yml index 11645ae3..e4c7a2cf 100644 --- a/group_vars/reverseproxy.yml +++ b/group_vars/reverseproxy.yml @@ -58,7 +58,6 @@ glob_reverseproxy: - {from: grafana.crans.org, to: "172.16.10.121:3000"} - {from: hedgedoc.crans.org, to: "172.16.10.128:3000"} - {from: helloworld.crans.org, to: 172.16.10.131} - - {from: horde.crans.org, to: 172.16.10.108} - {from: imprimante.crans.org, to: 172.16.10.131} - {from: intranet.crans.org, to: 172.16.10.156} - {from: linx.crans.org, to: "172.16.10.119:8080"} diff --git a/host_vars/fyre.adm.crans.org.yml b/host_vars/fyre.adm.crans.org.yml index 89f59169..21ad35fc 100644 --- a/host_vars/fyre.adm.crans.org.yml +++ b/host_vars/fyre.adm.crans.org.yml @@ -68,7 +68,6 @@ loc_prometheus: - https://lists.crans.org/ - https://cas.crans.org/ - https://ethercalc.crans.org/ - - https://webmail.crans.org/horde/login.php - https://gitlab.crans.org/ - https://perso.crans.org/crans/ - https://install-party.crans.org/ diff --git a/host_vars/horde.adm.crans.org.yml b/host_vars/horde.adm.crans.org.yml deleted file mode 100644 index eab3d4f8..00000000 --- a/host_vars/horde.adm.crans.org.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -interfaces: - adm: eth0 - -loc_unattended: - reboot: true - -loc_needrestart: - override: [] diff --git a/host_vars/tealc.adm.crans.org.yml b/host_vars/tealc.adm.crans.org.yml index bb6fb557..8618f5ad 100644 --- a/host_vars/tealc.adm.crans.org.yml +++ b/host_vars/tealc.adm.crans.org.yml @@ -18,9 +18,6 @@ loc_postgres: - db: etherpad_tmp user: crans map: {name: etherpad_tmp, system: etherpad, pg: crans} - - db: horde5 - user: www-data - map: {name: horde, system: www-data, pg: www-data} - db: roundcube user: roundcube map: {name: webmail, system: www-data, pg: roundcube} diff --git a/hosts b/hosts index 626c164f..4abb0817 100644 --- a/hosts +++ b/hosts @@ -114,9 +114,6 @@ gitlab-ci.adm.crans.org [grafana] fyre.adm.crans.org -[horde] -horde.adm.crans.org - [irc] irc.adm.crans.org diff --git a/plays/horde.yml b/plays/horde.yml deleted file mode 100755 index faccd685..00000000 --- a/plays/horde.yml +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env ansible-playbook ---- -# Moi j'aime le ocaml et lui il installe horde -- hosts: horde - vars: - horde: "{{ glob_horde | default({}) | combine(loc_horde | default({})) }}" - roles: - - horde diff --git a/roles/horde/README.md b/roles/horde/README.md deleted file mode 100644 index 133011b6..00000000 --- a/roles/horde/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# Horde -Ce rôle ansible deploie une instance du webmail horde. - -## Variables - - horde. : - - secret : le secret de horde - - imap : le serveur imap - - smtp : le serveur smtp (il doit juste être contactable depuis le serveur - imap) - - maildomain : le nom de domaine depuis qui envoyé les mails - - db : la bdd - - admins : la liste des admins de horde - - redirection : ou rediriger les utilisateurs si il essaie de voir la racine - du site - - src_hostname : on utilise deux hostnames, le premier va rediriger vers le - second. Ici c'est le premier - - dest_hostname : Ici c'est le second - - admin_src_hostname : même chose mais sur le réseau d'administration. Ici - c'est le premier - - admin_dest_hostname : Ici c'est le second - - zone_ipv4 : la zone ipv4 du réseaux sur lequel le proxy discute avec le - serveur - - zone ipv6 : la zone ipv6 du réseaux sur lequel le proxy discute avec le - serveur - - loc_horde : - - ipv6 : l'ipv6 du serveur diff --git a/roles/horde/handlers/main.yml b/roles/horde/handlers/main.yml deleted file mode 100644 index 5a2a60a3..00000000 --- a/roles/horde/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Restart nginx - service: - name: nginx.service - state: restarted diff --git a/roles/horde/tasks/main.yml b/roles/horde/tasks/main.yml deleted file mode 100644 index 8cb36f53..00000000 --- a/roles/horde/tasks/main.yml +++ /dev/null @@ -1,72 +0,0 @@ ---- -# Setup dependencies -- name: Install horde APT dependencies - apt: - update_cache: true - name: "{{ item }}" - loop: # Install dependencies in the right order. - - nginx - - php-fpm - - php-horde-webmail - - php-pgsql - - oidentd - register: apt_result - retries: 3 - until: apt_result is succeeded - -- name: Configure horde - template: - src: "{{ item }}.j2" - dest: /etc/{{ item }} - owner: www-data - group: www-data - mode: 0640 - loop: - - horde/horde/conf.php - - horde/imp/backends.php - -- name: Enable horde plugins - template: - src: horde/{{ item }}/conf.php.j2 - dest: /etc/horde/{{ item }}/conf.php - owner: www-data - group: www-data - mode: 0640 - loop: - - gollem - - imp - - ingo - - kronolith - - mnemo - - nag - - trean - - turba - -- name: Configure nginx site - template: - src: "{{ item }}.j2" - dest: /etc/{{ item }} - owner: root - group: root - mode: 0644 - loop: - - nginx/sites-available/webmail - - nginx/sites-available/horde - - nginx/snippets/php.conf - notify: Restart nginx - -- name: Enable nginx site - file: - src: /etc/nginx/sites-available/{{ item }} - dest: /etc/nginx/sites-enabled/{{ item }} - state: link - loop: - - webmail - - horde - notify: Restart nginx - -- name: Indicate role in motd - template: - src: update-motd.d/05-service.j2 - dest: /etc/update-motd.d/05-horde - mode: 0755 diff --git a/roles/horde/templates/horde/gollem/conf.php.j2 b/roles/horde/templates/horde/gollem/conf.php.j2 deleted file mode 100644 index abd03a53..00000000 --- a/roles/horde/templates/horde/gollem/conf.php.j2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ ansible_header | comment(decoration='// ') }} - - false, - 'name' => 'IMAP Cr@ns', - 'hostspec' => '{{ horde.imap }}', - 'hordeauth' => true, - 'protocol' => 'imap', - 'port' => 143, - 'secure' => 'tls', - 'maildomain' => '{{ horde.maildomain }}', - 'smtp' => array( - 'auth' => true, - 'horde_auth' => true, - 'host' => '{{ horde.mailer.host }}', - 'port' => 587, - ), - 'cache' => false, -); -?> diff --git a/roles/horde/templates/horde/imp/conf.php.j2 b/roles/horde/templates/horde/imp/conf.php.j2 deleted file mode 100644 index 31ee99c4..00000000 --- a/roles/horde/templates/horde/imp/conf.php.j2 +++ /dev/null @@ -1,22 +0,0 @@ -{{ ansible_header | comment(decoration='// ') }} - - Horde a été déployé sur cette machine. Voir https://gitlab.crans.org/nounous/ansible/-/tree/master/roles/horde.