Everbrent/cis
8
0
Fork 0
mirror of https://github.com/m8tin/cis.git synced 2026-06-02 14:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed printOwnDomain.sh

Browse Source
This commit is contained in:
m8in
2026-05-17 17:20:46 +02:00
parent b2107e3092
commit a0309c3b8b
3 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/base.module.sh
+8 -7
View File
@@ -67,8 +67,8 @@ function prepare.setCIS() {
# Retrieves the variables for this module using 'BASH_SOURCE[0]', the infos about the script using '$0'.
local _ROOT_TRUNK _FULLBASENAME _FULLSCRIPTNAME
_FULLBASENAME=$(realpath "${BASH_SOURCE[0]}" 2> /dev/null)
_FULLSCRIPTNAME=$(realpath "${0}" 2> /dev/null)
_FULLBASENAME="$(realpath "${BASH_SOURCE[0]}" 2> /dev/null)"
_FULLSCRIPTNAME="$(realpath "${0}" 2> /dev/null)"
_ROOT_TRUNK="${_FULLSCRIPTNAME%cis/*}"
while [ ! -d "${_ROOT_TRUNK}cis/core/" ]; do
@@ -84,10 +84,7 @@ function prepare.setCIS() {
# Folders always ends with an tailing '/'
CIS[ROOT]="${_ROOT_TRUNK:?"Missing ROOT_TRUNK"}cis/"
CIS[COREROOT]="${CIS[ROOT]:?"Missing ROOT"}core/"
CIS[SCRIPTSROOT]="${CIS[ROOT]}script/"
CIS[DOMAIN]=$(base.printOwnDomain "${CIS[ROOT]}")
CIS[MODULEDIR]="${CIS[ROOT]}module/"
CIS[DOMAIN]="$(base.printOwnDomain "${CIS[ROOT]:?"Missing ROOT"}")"
[ -z "${CIS[DOMAIN]}" ] \
&& echo \
@@ -96,6 +93,10 @@ function prepare.setCIS() {
&& echo \
&& return 1
CIS[COREROOT]="${CIS[ROOT]}core/"
CIS[MODULEROOT]="${CIS[ROOT]}module/"
CIS[SCRIPTSROOT]="${CIS[ROOT]}script/"
# Sets the valus of the global array 'CIS' and set it readonly
CIS[ARGS]="${@}"
CIS[HOME]="${HOME:-"/root"}/"
@@ -221,7 +222,7 @@ function base.filterComments() {
function base.loadModule() {
local _MODULENAME _MODULEFULLNAME
_MODULENAME="${1:?"Function base.loadModule(): Missing parameter MODULENAME."}"
_MODULEFULLNAME="${CIS[MODULEDIR]:?"Function base.loadModule(): Missing CISMODULEDIR."}/${_MODULENAME}.module.sh"
_MODULEFULLNAME="${CIS[MODULEROOT]:?"Function base.loadModule(): Missing CISMODULEDIR."}/${_MODULENAME}.module.sh"
readonly _MODULENAME _MODULEFULLNAME
#module already is loaded => return
core/printOwnDomain.sh
-30
View File
@@ -1,30 +0,0 @@
#!/bin/bash
#WARNING: Used for core functionality in setup.sh
# DO NOT rename the script and test changes well!
# Folders always ends with an tailing '/'
_SCRIPT="$(readlink -f "${0}" 2> /dev/null)"
_CIS_ROOT="${_SCRIPT%%/core/*}/" #Removes longest matching pattern '/core/*' from the end
_OVERRIDE_DOMAIN_FILE="${_CIS_ROOT:?"Missing CIS_ROOT"}overrideOwnDomain"
# There has to be one dot at least.
_BOOT_DOMAIN="$(hostname -b | grep -F '.' | cut -d. -f2-)"
# Take OVERRIDING_DOMAIN_FILE without empty lines and comments, then take the first line without leading spaces
_OVERRIDE_DOMAIN="$(grep -vE '^[[:space:]]*$|^[[:space:]]*#' "${_OVERRIDE_DOMAIN_FILE}" 2> /dev/null | head -n 1 | xargs)"
! [ -z "${_OVERRIDE_DOMAIN}" ] \
&& [ "${_OVERRIDE_DOMAIN}" != "${_BOOT_DOMAIN}" ] \
&& echo "WARNING: Domain has been overridden by: ${_OVERRIDE_DOMAIN_FILE}" >&2 \
&& echo "${_OVERRIDE_DOMAIN}" \
&& exit 0
! [ -z "${_BOOT_DOMAIN}" ] \
&& echo "${_BOOT_DOMAIN}" \
&& exit 0
echo "It was impossible to find out the domain of this host, please prepare this host first." >&2
exit 1