From 0f466f6d5aec0d3fcf406fe2bb71effa5a1a1386 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 13 Apr 2019 10:41:30 +0200 Subject: [PATCH] Cleanup e-mails from immae.eu domains --- nixops/modules/dns/default.nix | 6 +++--- nixops/modules/websites/tools/cloud/nextcloud.nix | 4 ++-- nixops/modules/websites/tools/dav/davical.nix | 2 +- nixops/modules/websites/tools/diaspora/diaspora.nix | 4 ++-- nixops/modules/websites/tools/git/mantisbt/mantisbt.nix | 8 ++++---- nixops/modules/websites/tools/mastodon/mastodon.nix | 2 +- nixops/modules/websites/tools/mediagoblin/mediagoblin.nix | 2 +- nixops/modules/websites/tools/peertube/peertube.nix | 4 ++-- nixops/modules/websites/tools/tools/kanboard.nix | 2 +- nixops/modules/websites/tools/tools/ttrss.nix | 4 ++-- nixops/modules/websites/tools/tools/wallabag.nix | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nixops/modules/dns/default.nix b/nixops/modules/dns/default.nix index 7937714..34019d1 100644 --- a/nixops/modules/dns/default.nix +++ b/nixops/modules/dns/default.nix @@ -68,8 +68,8 @@ server-id none; ''; zones = with myconfig.env.dns; - assert (builtins.substring ((builtins.stringLength soa.email)-1) 1 soa.email) == "."; - assert (builtins.substring ((builtins.stringLength soa.primary)-1) 1 soa.primary) == "."; + assert (builtins.substring ((builtins.stringLength soa.email)-1) 1 soa.email) != "."; + assert (builtins.substring ((builtins.stringLength soa.primary)-1) 1 soa.primary) != "."; (map (conf: { name = conf.name; master = false; @@ -87,7 +87,7 @@ else []; file = pkgs.writeText "${conf.name}.zone" '' $TTL 10800 - @ IN SOA ${soa.primary} ${soa.email} ${soa.serial} ${soa.refresh} ${soa.retry} ${soa.expire} ${soa.ttl} + @ IN SOA ${soa.primary}. ${builtins.replaceStrings ["@"] ["."] soa.email}. ${soa.serial} ${soa.refresh} ${soa.retry} ${soa.expire} ${soa.ttl} ${lib.concatStringsSep "\n" (map (x: "@ IN NS ${x}.") (lib.concatMap (n: lib.attrsets.mapAttrsToList (k: v: k) ns.${n}) conf.ns))} diff --git a/nixops/modules/websites/tools/cloud/nextcloud.nix b/nixops/modules/websites/tools/cloud/nextcloud.nix index 2e52828..59930fb 100644 --- a/nixops/modules/websites/tools/cloud/nextcloud.nix +++ b/nixops/modules/websites/tools/cloud/nextcloud.nix @@ -148,9 +148,9 @@ let 'mail_smtphost' => '127.0.0.1', 'mail_smtpname' => ''', 'mail_smtppassword' => ''', - 'mail_from_address' => 'owncloud', + 'mail_from_address' => 'nextcloud', 'mail_smtpauth' => false, - 'mail_domain' => 'immae.eu', + 'mail_domain' => 'tools.immae.eu', 'memcache.local' => '\\OC\\Memcache\\APCu', 'memcache.locking' => '\\OC\\Memcache\\Redis', 'filelocking.enabled' => true, diff --git a/nixops/modules/websites/tools/dav/davical.nix b/nixops/modules/websites/tools/dav/davical.nix index 6668fa1..f6cb5bb 100644 --- a/nixops/modules/websites/tools/dav/davical.nix +++ b/nixops/modules/websites/tools/dav/davical.nix @@ -22,7 +22,7 @@ let $c->readonly_webdav_collections = false; - $c->admin_email ='davical@immae.eu'; + $c->admin_email ='davical@tools.immae.eu'; $c->restrict_setup_to_admin = true; diff --git a/nixops/modules/websites/tools/diaspora/diaspora.nix b/nixops/modules/websites/tools/diaspora/diaspora.nix index a57c529..82bca8c 100644 --- a/nixops/modules/websites/tools/diaspora/diaspora.nix +++ b/nixops/modules/websites/tools/diaspora/diaspora.nix @@ -77,14 +77,14 @@ let wordpress: mail: enable: true - sender_address: 'diaspora@immae.eu' + sender_address: 'diaspora@tools.immae.eu' method: 'sendmail' smtp: sendmail: location: '/run/wrappers/bin/sendmail' admins: account: "ismael" - podmin_email: 'diaspora@immae.eu' + podmin_email: 'diaspora@tools.immae.eu' relay: outbound: inbound: diff --git a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix index 9bb8476..0cd98a1 100644 --- a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix +++ b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix @@ -34,10 +34,10 @@ let $g_smtp_host = 'localhost'; $g_smtp_username = '''; $g_smtp_password = '''; - $g_webmaster_email = 'webmaster@immae.eu'; - $g_from_email = 'noreply@immae.eu'; - $g_return_path_email = 'webmaster@immae.eu'; - $g_from_name = 'Mantis Bug Tracker at immae.eu'; + $g_webmaster_email = 'mantisbt@tools.immae.eu'; + $g_from_email = 'mantisbt@tools.immae.eu'; + $g_return_path_email = 'mantisbt@tools.immae.eu'; + $g_from_name = 'Mantis Bug Tracker at git.immae.eu'; $g_email_receive_own = OFF; # --- LDAP --- $g_login_method = LDAP; diff --git a/nixops/modules/websites/tools/mastodon/mastodon.nix b/nixops/modules/websites/tools/mastodon/mastodon.nix index d4e437a..90e537f 100644 --- a/nixops/modules/websites/tools/mastodon/mastodon.nix +++ b/nixops/modules/websites/tools/mastodon/mastodon.nix @@ -80,7 +80,7 @@ let VAPID_PUBLIC_KEY=${env.vapid.public} SMTP_DELIVERY_METHOD=sendmail - SMTP_FROM_ADDRESS=notifications@mastodon.immae.eu + SMTP_FROM_ADDRESS=mastodon@tools.immae.eu SENDMAIL_LOCATION="/run/wrappers/bin/sendmail" PAPERCLIP_ROOT_PATH=${varDir} diff --git a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix index 53796d5..e1876ae 100644 --- a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix +++ b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix @@ -196,7 +196,7 @@ in [mediagoblin] direct_remote_path = /mgoblin_static/ - email_sender_address = "mediagoblin@mail.immae.eu" + email_sender_address = "mediagoblin@tools.immae.eu" #sql_engine = sqlite:///%(data_basedir)s/mediagoblin.db sql_engine = ${env.psql_url} diff --git a/nixops/modules/websites/tools/peertube/peertube.nix b/nixops/modules/websites/tools/peertube/peertube.nix index 75629bd..ba49e2b 100644 --- a/nixops/modules/websites/tools/peertube/peertube.nix +++ b/nixops/modules/websites/tools/peertube/peertube.nix @@ -98,7 +98,7 @@ let tls: true # If you use StartTLS: false disable_starttls: false ca_file: null # Used for self signed certificates - from_address: 'peertube@immae.eu' + from_address: 'peertube@tools.immae.eu' storage: tmp: '${varDir}/storage/tmp/' avatars: '${varDir}/storage/avatars/' @@ -130,7 +130,7 @@ let captions: size: 500 # Max number of video captions/subtitles you want to cache admin: - email: 'peertube@immae.eu' + email: 'peertube@tools.immae.eu' contact_form: enabled: true signup: diff --git a/nixops/modules/websites/tools/tools/kanboard.nix b/nixops/modules/websites/tools/tools/kanboard.nix index 399d3e1..8408ffa 100644 --- a/nixops/modules/websites/tools/tools/kanboard.nix +++ b/nixops/modules/websites/tools/tools/kanboard.nix @@ -12,7 +12,7 @@ rec { }; config = writeText "config.php" ''