diff --git a/conf/disk_exemple.conf.sh b/conf/disk_exemple.conf.sh new file mode 100644 index 0000000..876c412 --- /dev/null +++ b/conf/disk_exemple.conf.sh @@ -0,0 +1,44 @@ +# Disk conf exemple +export CONF_DISK="sdc sdd" + +export DISK_PART_sdc="512M 1G 0" +export DISK_TYPE_sdc1="raid" +export DISK_TYPE_sdc2="ext4" +export DISK_MP_sdc2="/somewhere/here" +export DISK_TYPE_sdc3="raid" + +export DISK_PART_sdd=$DISK_PART_sdc +export DISK_TYPE_sdd1=$DISK_TYPE_sdc1 +export DISK_TYPE_sdd2=$DISK_TYPE_sdc2 +export DISK_MD_sdd2="/somewhere/else" +export DISK_TYPE_sdd3=$DISK_TYPE_sdc3 + +# RAID exemple +export CONF_RAID="md0 md1" + +export RAID_DISKS_md0="sdc0 sdd0" +export RAID_FORMAT_md0="ext4" +export RAID_MP_md0="/raid/is" + +export RAID_DISKS_md1="sdc2 sdd2" +export RAID_FORMAT_md1="xfs" +export RAID_MP_md1="/raid/other" + +# ZFS exemple +export ZPOOL_LIST="calcul local" + +export ZPOOL_OPTIONS_calcul="mirror" +export ZPOOL_MP_calcul="/local" +export ZPOOL_DRV_calcul="sdc sdd" +export ZPOOL_FS_calcul="vm debian data" +export ZPOOL_MP_calcul_vm="/local/vm" # We could avoid that declaration +export ZPOOL_MP_calcul_debian="/usr/local" +export ZPOOL_MP_calcul_data="/data" + +export ZPOOL_OPTIONS_local="raidz1" +export ZPOOL_MP_local="/share" +export ZPOOL_DRV_local="sdc sdd sde" +export ZPOOL_FS_local="video music books" +#export ZPOOL_MP_local_video="/share/video" # Uneeded as it's ZFS default behavour +#export ZPOOL_MP_local_music="/share/music" +#export ZPOOL_MP_local_books="/share/books" diff --git a/conf/init.conf.sh b/conf/init.conf.sh index fb17fe6..f9f2a5c 100644 --- a/conf/init.conf.sh +++ b/conf/init.conf.sh @@ -91,5 +91,5 @@ VM_NAME=vm-levasseur # Liste des modules à executer (surchargeable en ligne de commande) MODULE_LIST="conf_ntp upgrade_dist authnz conf_disks conf_locale conf_ssh \ - conf_mail install_desktop install_pkg install_chromium \ + conf_mail install_desktop install_pkg \ select_system_proxy install_profile" diff --git a/doc/dev.md b/doc/dev.md index ce555cf..39fb3c2 100644 --- a/doc/dev.md +++ b/doc/dev.md @@ -738,7 +738,8 @@ The following global variables will be set at the end of the execution: - **```SYS_VER```** for the distribution version - **```SYS_CODE```** for the distribution codename -The ```SYS_CODE``` variable won't be set if your distribution provides no codename. +The ```SYS_CODE``` variable won't be set if your distribution provides no +codename. ### 13.2. Other functionnalities That file don't provide any other thing that the previously listed functions. diff --git a/lib/version.sh b/lib/version.sh index f8f4afd..c0f1d63 100644 --- a/lib/version.sh +++ b/lib/version.sh @@ -37,7 +37,7 @@ get_os_version() unset maj min fi - # Return values on standard stdout + # Return values on stdout echo ${ID,,} ${VERSION_ID} ${VERSION_CODENAME,,} ) } diff --git a/modules/hardenning_vm.sh b/modules/hardenning_vm.sh index 54a254a..127fa4d 100644 --- a/modules/hardenning_vm.sh +++ b/modules/hardenning_vm.sh @@ -19,7 +19,7 @@ vm_hardenning() pkginst linux-image-cloud-amd64 if [[ $WITH_ROUTING == yes ]]; then - # do it! + : # do it! fi } diff --git a/modules/patch_snmp.sh b/modules/patch_snmp.sh index 0bdaa1f..b55dd5c 100644 --- a/modules/patch_snmp.sh +++ b/modules/patch_snmp.sh @@ -8,7 +8,7 @@ # https://opensource.org/licenses/BSD-3-Clause # ------------------------------------------------------------------------------ -export VER_patch_snmp="0.1.0" +export VER_patch_snmp="0.1.1" export DEP_patch_snmp="install_pkg" patch_snmp() @@ -17,7 +17,7 @@ patch_snmp() backup_dist /etc/snmp/snmpd.conf /etc/default/snmpd \ /lib/systemd/system/snmpd.service /etc/init.d/snmpd install_file snmpd/snmpd.conf /etc/snmp/snmpd.conf - tagfile /etc/snmp/snmpd.conf + tag_file /etc/snmp/snmpd.conf # No longer required with Debian >= 11 or Devuan >= 4 if [[ ($SYS_DIST == 'debian' && $SYS_VER -lt 11) || ($SYS_DIST == 'devuan' && $SYS_VER -lt 4) ]]; then diff --git a/modules/upgrade_dist.sh b/modules/upgrade_dist.sh index 14f9291..9d14020 100644 --- a/modules/upgrade_dist.sh +++ b/modules/upgrade_dist.sh @@ -68,7 +68,7 @@ precheck_upgrade_dist() { prnt I "Checking network connectivity..." - if [[ $(noerror wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr) != 0 ]]; then + if [[ $(noerror wget -q --tries=10 --timeout=20 --spider http://www.tetaneutral.net) != 0 ]]; then prnt E "It seems network configuration is not functionnal! Giving up." die 160 fi