From 976ba1a9ee8d212abaaa7f3f7af098d6f13c8b6b Mon Sep 17 00:00:00 2001
From: fatalerrors <fatalerrors@geoffray-levasseur.org>
Date: Wed, 8 Dec 2021 17:35:21 +0100
Subject: [PATCH] renamed variable MAINDOM to REALM

---
 conf/includes/gl.conf.sh        | 10 +++++-----
 conf/includes/legos-bas.conf.sh |  8 ++++----
 conf/includes/legos.conf.sh     | 10 +++++-----
 modules/conf_ceph.sh            |  2 +-
 modules/conf_mail.sh            |  8 ++++----
 repo/common/postfix/main.cf     |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/conf/includes/gl.conf.sh b/conf/includes/gl.conf.sh
index 99252fd..09c7ea2 100644
--- a/conf/includes/gl.conf.sh
+++ b/conf/includes/gl.conf.sh
@@ -1,8 +1,8 @@
 # Domaine geoffray-levasseur.org
-export MAINDOM="geoffray-levasseur.org"
+export REALM="geoffray-levasseur.org"
 
 # Proxy apt-cacher-ng
-export PROXY_APT="balut.$MAINDOM"
+export PROXY_APT="balut.$REALM"
 export PROXY_APT_PORT="3142"
 
 # Available languanges and system language
@@ -16,7 +16,7 @@ export DEFAULT_SHELL="/bin/bash"
 export REMOVE_USERS="fatal"
 
 # NTP server list
-export NTPSERVERS="didicas.$MAINDOM cagua.$MAINDOM"
+export NTPSERVERS="didicas.$REALM cagua.$REALM"
 
 # Ceph share
 export CEPH_SRV_NAMES="mayon pinatubo ragang taal jolo"
@@ -37,7 +37,7 @@ export MK_SERVER_IP="192.168.1.201"
 export SMBSRV="silay"
 
 # Syslog
-export SYSLOG_SRV="biliran.$MAINDOM"
+export SYSLOG_SRV="biliran.$REALM"
 
 # System mail
-export MAIL_RELAY="matutum.$MAINDOM"
+export MAIL_RELAY="matutum.$REALM"
diff --git a/conf/includes/legos-bas.conf.sh b/conf/includes/legos-bas.conf.sh
index 90467a4..ce8bafc 100644
--- a/conf/includes/legos-bas.conf.sh
+++ b/conf/includes/legos-bas.conf.sh
@@ -1,10 +1,10 @@
 # Domaine LEGOS
-export MAINDOM="legos.obs-mip.fr"
+export REALM="legos.obs-mip.fr"
 
 # Proxy LEGOS
-#export PROXY_APT="acng.$MAINDOM"
+#export PROXY_APT="acng.$REALM"
 #export PROXY_APT_PORT="3142"
-export PROXY_SRV="proxy.$MAINDOM"
+export PROXY_SRV="proxy.$REALM"
 export PROXY_SRV_PORT="3128"
 
 # Langues supportés et langue du systême
@@ -19,4 +19,4 @@ export DEFAULT_SHELL="/bin/bash"
 #export CALCMOUNTPOINT="/calcul/$HOSTNAME"
 
 # Liste des serveurs NTP
-#export NTP_SERVERS="ntp1.$MAINDOM ntp2.$MAINDOM"
+#export NTP_SERVERS="ntp1.$REALM ntp2.$REALM"
diff --git a/conf/includes/legos.conf.sh b/conf/includes/legos.conf.sh
index f2ceaab..5148dd1 100644
--- a/conf/includes/legos.conf.sh
+++ b/conf/includes/legos.conf.sh
@@ -1,10 +1,10 @@
 # Domaine LEGOS
-export MAINDOM="legos.obs-mip.fr"
+export REALM="legos.obs-mip.fr"
 
 # Proxy LEGOS
-export PROXY_APT="acng.$MAINDOM"
+export PROXY_APT="acng.$REALM"
 export PROXY_APT_PORT="3142"
-export PROXY_SRV="proxy.$MAINDOM"
+export PROXY_SRV="proxy.$REALM"
 export PROXY_SRV_PORT="3128"
 
 # Langues supportés et langue du systême
@@ -19,7 +19,7 @@ export CALCTYPE="zfs"
 export CALCMOUNTPOINT="/calcul/$HOSTNAME"
 
 # Liste des serveurs NTP
-export NTP_SERVERS="ntp1.$MAINDOM ntp2.$MAINDOM"
+export NTP_SERVERS="ntp1.$REALM ntp2.$REALM"
 
 # Relay mail
-export MAIL_RELAY="smpt.$MAINDOM"
+export MAIL_RELAY="smpt.$REALM"
diff --git a/modules/conf_ceph.sh b/modules/conf_ceph.sh
index 4eff4cb..e1d6299 100644
--- a/modules/conf_ceph.sh
+++ b/modules/conf_ceph.sh
@@ -37,7 +37,7 @@ conf_ceph()
             echo >> /etc/hosts
             echo "# Ceph servers:" >> /etc/hosts
             for srv in $CEPH_SRV_NAMES; do
-                local line="$(eval echo \$CEPHIP_$srv)    $srv.$MAINDOM   $srv"
+                local line="$(eval echo \$CEPHIP_$srv)    $srv.$REALM   $srv"
                 prnt m "     - Adding line $line to /etc/hosts"
                 echo "$line" >> /etc/hosts
             done
diff --git a/modules/conf_mail.sh b/modules/conf_mail.sh
index 1a76c54..80df422 100644
--- a/modules/conf_mail.sh
+++ b/modules/conf_mail.sh
@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 # Variable:
 #  * HOSTNAME: Name of the host
-#  * MAINDOM: Default main domain name
+#  * REALM: Default main domain name
 #  * MAIL_RELAY: Name of the mail relay server
 # ------------------------------------------------------------------------------
 
@@ -23,15 +23,15 @@ conf_mail()
 
     prnt I "Configuration de postfix..."
     installfile postfix/main.cf /etc/postfix/main.cf
-    sed -i -e "s/@HOSTNAME@/$HOSTNAME/" -e "s/@MAINDOM@/$MAINDOM/" \
+    sed -i -e "s/@HOSTNAME@/$HOSTNAME/" -e "s/@REALM@/$REALM/" \
         -e "s/@MAIL_RELAY@/$MAIL_RELAY/" /etc/postfix/main.cf
-    echo $HOSTNAME.$MAINDOM > /etc/mailname
+    echo $HOSTNAME.$REALM > /etc/mailname
     svc_restart postfix
 }
 
 precheck_conf_mail()
 {
-    if [[ -z $MAINDOM ]]; then
+    if [[ -z $REALM ]]; then
         prnt E "Aucun domaine principal renseigné."
         die 158
     fi
diff --git a/repo/common/postfix/main.cf b/repo/common/postfix/main.cf
index 3383886..8b23b91 100644
--- a/repo/common/postfix/main.cf
+++ b/repo/common/postfix/main.cf
@@ -31,7 +31,7 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 # information on enabling SSL in the smtp client.
 
 #smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
-myhostname = @HOSTNAME@.@MAINDOM@
+myhostname = @HOSTNAME@.@REALM@
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname