Use dirs for sections.

7.Munin/0_setup.sh → 2.Common_services/6.Munin/0_setup.sh

 #!/bin/bash
 source /root/envsetup/conf.sh
 
-# This script should be run after Nginx and Wowza setup (if they should be installed)
+# This script should be run after Nginx, MySQL and Wowza setup (if they should be installed)
 
 # munin
 DEBIAN_FRONTEND=noninteractive apt-get install -y ubicast-config

23.Initialize_environment/0_setup.sh

-#!/bin/bash
-source /root/envsetup/conf.sh
-
-# hostname
-echo "127.0.0.1 ${ETC_HOSTNAME}" >> /etc/hosts
-echo ${ETC_HOSTNAME} > /etc/hostname
-
-# DNS
-cat > /etc/resolv.conf << EOF
-search ubicast.net
-nameserver 192.168.40.3
-nameserver 192.168.40.2
-nameserver 192.168.40.6
-EOF
-
-# set ubicast account pwd
-if ( ! test -z ${SHELL_UBICAST_PWD} ); then
-	echo -e "${SHELL_UBICAST_PWD}\n${SHELL_UBICAST_PWD}" | passwd -q ubicast
-fi
-
-# create admin account
-if ( ! id admin >/dev/null ); then
-	useradd -m admin --shell /bin/bash
-fi
-usermod -aG sudo admin
-if ( ! test -z ${SHELL_ADMIN_PWD} ); then
-	echo -e "${SHELL_ADMIN_PWD}\n${SHELL_ADMIN_PWD}" | passwd -q admin
-fi
-
-# DELL server - install dell openmanage
-if ( ! dpkg -l | grep dmidecode )
-then
-apt-get install -y dmidecode
-fi
-
-dmidecode > /tmp/dmidecode
-
-if ( grep Dell /tmp/dmidecode )
-then
-echo 'deb http://linux.dell.com/repo/community/ubuntu xenial openmanage' | sudo tee -a /etc/apt/sources.list.d/linux.dell.com.sources.list
-gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F 
-gpg -a --export 1285491434D8786F | sudo apt-key add - 
-
-apt-get update && apt-get install -y srvadmin-all
-
-update-rc.d dsm_om_connsvc defaults
-echo "@reboot root /usr/sbin/service dsm_om_connsvc start" > /etc/cron.d/dell_openmanage
-
-sed -i "s@^root@root,admin@" /opt/dell/srvadmin/etc/omarolemap
-
-service dsm_om_connsvc start
-fi

3.New_server_deployment/4.Dell_openmanage/0_setup.sh

+#!/bin/bash
+source /root/envsetup/conf.sh
+
+# DELL server - install dell openmanage
+if ( ! dpkg -l | grep dmidecode ); then
+	apt-get install -y dmidecode
+fi
+
+if ( dmidecode | grep Dell ); then
+	echo 'deb http://linux.dell.com/repo/community/ubuntu xenial openmanage' | sudo tee -a /etc/apt/sources.list.d/linux.dell.com.sources.list
+	gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F 
+	gpg -a --export 1285491434D8786F | sudo apt-key add - 
+
+	apt-get update
+	apt-get install -y srvadmin-all
+
+	update-rc.d dsm_om_connsvc defaults
+	echo "@reboot root /usr/sbin/service dsm_om_connsvc start" > /etc/cron.d/dell_openmanage
+
+	sed -i "s@^root@root,admin@" /opt/dell/srvadmin/etc/omarolemap
+
+	service dsm_om_connsvc start
+fi