From 1e9603988af3ada13d16a1141a6a9262adc6ecfd Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Fri, 11 Mar 2022 18:10:07 +0100 Subject: [PATCH] update servers.json --- servers.json | 56 ++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/servers.json b/servers.json index 9dbe0c5..f184046 100644 --- a/servers.json +++ b/servers.json @@ -25,14 +25,14 @@ "roundcube": {"applicationservices": ["roundcube", "provider-systemd-machined"]}, "vaultwarden": {"applicationservices": ["vaultwarden", "provider-systemd-machined"]} }, - "servers": {"cloud": {"module": "host", + "servers": {"cloud.silique.fr": {"module": "host", "values": {"rougail.host_install_dir": "/root/installations", "rougail.host_dhcp_interface": ["enp3s0"] } }, "unbound.in.silique.fr": {"module": "unbound", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns_resolver.unbound_default_forwards": ["8.8.8.8"] } }, @@ -40,14 +40,14 @@ "informations": {"zones_name": ["external", "list"], "extra_domainnames": ["nsd.list.silique.fr"] }, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns_server.nsd_resolver": "unbound.in.silique.fr" } }, "revprox.in.silique.fr": {"module": "revprox", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", - "rougail.dns.dns_client_address": "nsd.in.silique.fr", + "values": {"rougail.host": "cloud.silique.fr", + "rougail.dns.dns_client_address": "nsd.in.silique.fr", "rougail.nginx.nginx_default": "cloud.silique.fr" } }, @@ -55,7 +55,7 @@ "informations": {"zones_name": ["external", "list"], "extra_domainnames": ["mail.list.silique.fr"] }, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "unbound.in.silique.fr", "rougail.postfix.postfix_mail_hostname": "mail.silique.fr" } @@ -63,9 +63,9 @@ "dovecot.in.silique.fr": {"module": "dovecot", "informations": {"zones_name": ["external"] }, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr", - "rougail.postfix.postfix_my_domains": ["cloud.silique.fr"], + "rougail.postfix.postfix_my_domains": ["silique.fr"], "rougail.smtp.smtp_relay_address": "mail.in.silique.fr", "rougail.annuaire.ldap_server_address": "ldap.in.silique.fr", "rougail.dovecot.revprox_server_domainname": "revprox.in.silique.fr", @@ -74,35 +74,35 @@ }, "redis-rc.in.silique.fr": {"module": "redis", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr" } }, "redis-nc.in.silique.fr": {"module": "redis", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr" } }, "redis-gi.in.silique.fr": {"module": "redis", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr" } }, "ldap.in.silique.fr": {"module": "ldap", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr", - "accounts.users.ldap_user_mail": ["gnunux@silique.fr", "bbohard@silique.fr", "ddtddt@silique.fr"], - "accounts.users.ldap_user_uid": {"0": "gnunux", "1": "bbohard", "2": "ddtddt"}, - "accounts.users.ldap_user_sn": {"0": "Emmanuel", "1": "Benjamin", "2": "Damien"}, - "accounts.users.ldap_user_gn": {"0": "Garette", "1": "Bohard", "2": "Thomas"} + "accounts.users.ldap_user_mail": ["gnunux@silique.fr", "bbohard@silique.fr", "ddtddt@silique.fr", "panda@silique.fr"], + "accounts.users.ldap_user_uid": {"0": "gnunux", "1": "bbohard", "2": "ddtddt", "3": "panda"}, + "accounts.users.ldap_user_sn": {"0": "Emmanuel", "1": "Benjamin", "2": "Damien", "3": "Ludwig"}, + "accounts.users.ldap_user_gn": {"0": "Garette", "1": "Bohard", "2": "Thomas", "3": "Seys"} } }, "lemonldap.in.silique.fr": {"module": "lemonldap", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr", "rougail.annuaire.ldap_server_address": "ldap.in.silique.fr", "rougail.smtp.smtp_relay_address": "mail.in.silique.fr", @@ -114,7 +114,7 @@ }, "nextcloud.in.silique.fr": {"module": "nextcloud", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr", "rougail.nextcloud.nextcloud_mail_admin": "gnunux@silique.fr", "rougail.postgresql.pg_client_server_domainname": "postgresql.in.silique.fr", @@ -123,17 +123,19 @@ "rougail.smtp.smtp_relay_address": "mail.in.silique.fr", "rougail.nginx.revprox_client_server_domainname": "revprox.in.silique.fr", "rougail.nginx.revprox_client_external_domainname": "cloud.silique.fr", + "rougail.nginx.revprox_client.revprox_client_location": ["/nextcloud"], "rougail.oauth2_client.oauth2_client_server_domainname": "lemonldap.in.silique.fr" } }, "roundcube.in.silique.fr": {"module": "roundcube", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr", "rougail.postgresql.pg_client_server_domainname": "postgresql.in.silique.fr", "rougail.annuaire.ldap_server_address": "ldap.in.silique.fr", "rougail.nginx.revprox_client_server_domainname": "revprox.in.silique.fr", "rougail.nginx.revprox_client_external_domainname": "cloud.silique.fr", + "rougail.nginx.revprox_client.revprox_client_location": ["/roundcube"], "rougail.redis.redis_client_server_domainname": "redis-rc.in.silique.fr", "rougail.imap.imap_address": "dovecot.in.silique.fr", "rougail.oauth2_client.oauth2_client_server_domainname": "lemonldap.in.silique.fr" @@ -143,19 +145,20 @@ "informations": {"zones_name": ["external", "list"], "extra_domainnames": ["postgresql.list.silique.fr"] }, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr" } }, "mailman.list.silique.fr": {"module": "mailman", "informations": {"zones_name": ["list"] }, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.list.silique.fr", "rougail.smtp.smtp_relay_address": "mail.list.silique.fr", "rougail.postgresql.pg_client_server_domainname": "postgresql.list.silique.fr", "rougail.nginx.revprox_client_server_domainname": "revprox.in.silique.fr", "rougail.nginx.revprox_client_external_domainname": "cloud.silique.fr", + "rougail.nginx.revprox_client.revprox_client_location": ["/mailman"], "rougail.mailman.mailman_mail_owner": "admin@silique.fr", "rougail.mailman.mailman_domains": ["lists.silique.fr"], "rougail.oauth2_client.oauth2_client_server_domainname": "lemonldap.in.silique.fr", @@ -164,19 +167,19 @@ }, "vaultwarden.in.silique.fr": {"module": "vaultwarden", "informations": {"zones_name": ["external"]}, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr", - "rougail.vaultwarden.vaultwarden_admin_email": "gnunux@silique.fr", + "rougail.vaultwarden.vaultwarden_admin_email": "admin@silique.fr", "rougail.postgresql.pg_client_server_domainname": "postgresql.in.silique.fr", "rougail.nginx.revprox_client_server_domainname": "revprox.in.silique.fr", - "rougail.nginx.revprox_client_external_domainname": "cloud.silique.fr", + "rougail.nginx.revprox_client_external_domainname": "secrets.silique.fr", "rougail.smtp.smtp_relay_address": "mail.in.silique.fr" } }, "gitea.in.silique.fr": {"module": "gitea", "informations": {"zones_name": ["external"] }, - "values": {"rougail.host": "cloud", + "values": {"rougail.host": "cloud.silique.fr", "rougail.dns.dns_client_address": "nsd.in.silique.fr", "rougail.smtp.smtp_relay_address": "mail.in.silique.fr", "rougail.gitea.gitea_mail_sender": "gitea@silique.fr", @@ -184,7 +187,8 @@ "rougail.nginx.revprox_client_server_domainname": "revprox.in.silique.fr", "rougail.redis.redis_client_server_domainname": "redis-gi.in.silique.fr", "rougail.oauth2_client.oauth2_client_server_domainname": "lemonldap.in.silique.fr", - "rougail.nginx.revprox_client_external_domainname": "cloud.silique.fr" + "rougail.nginx.revprox_client_external_domainname": "cloud.silique.fr", + "rougail.nginx.revprox_client.revprox_client_location": ["/gitea"] } } }