diff --git a/6.CampusManager/1.Install_CampusManager/0_setup.sh b/6.CampusManager/1.Install_CampusManager/0_setup.sh index 04217e6ccc7ff8af0487161db3bfec634e7ec1d7..100d90dd9003bab88a874a8db3411f8084811bff 100755 --- a/6.CampusManager/1.Install_CampusManager/0_setup.sh +++ b/6.CampusManager/1.Install_CampusManager/0_setup.sh @@ -1,8 +1,12 @@ #!/bin/bash source /root/envsetup/global-conf.sh -# install cm -apt-get install -y campus-manager -# configure nginx -sed -i "s@server_name skyreach;@server_name ${CM_SERVER_NAME};@" /etc/nginx/sites-available/skyreach.conf -service nginx restart +if ( apt-cache madison campus-manager | grep "campus-manager | " ); then + # install cm + apt-get install -y campus-manager + # configure nginx + sed -i "s@server_name skyreach;@server_name ${CM_SERVER_NAME};@" /etc/nginx/sites-available/skyreach.conf + service nginx restart +else + echo "${YELLOW}The campus-manager package is not available in APT repositories, install skipped.${NC}" +fi diff --git a/6.CampusManager/2.Configure_apt_cacher_ng/0_setup.py b/6.CampusManager/2.Configure_apt_cacher_ng/0_setup.py index 7c9125c936ebae300a4578e51091330e24934768..07a3b1566e3164cdee99254d5d9e60163de9ebec 100755 --- a/6.CampusManager/2.Configure_apt_cacher_ng/0_setup.py +++ b/6.CampusManager/2.Configure_apt_cacher_ng/0_setup.py @@ -22,9 +22,9 @@ def setup(interactive=True): utils.log('File "%s" updated.' % path) else: utils.log('File "%s" already up to date.' % path) + cmds = [ + 'service apt-cacher-ng restart', + ] + utils.run_commands(cmds) else: utils.log('The configuration file "%s" does not exist, nothing to do.' % path) - cmds = [ - 'service apt-cacher-ng restart', - ] - utils.run_commands(cmds) diff --git a/global-conf.sh b/global-conf.sh index 25e0b8731dfacf94c048fae4f6240cca52b714b4..fb182cab7e9ea35b94f97d9b485e0dabdb2d1999 100644 --- a/global-conf.sh +++ b/global-conf.sh @@ -7,9 +7,12 @@ # -- Constants -- CYAN='\033[0;36m' +PURPLE='\033[0;35m' +BLUE='\033[0;34m' +YELLOW='\033[0;32m' GREEN='\033[0;32m' RED='\033[0;31m' -NC='\033[0m' +NC='\033[0;0m' # -- System -- # Skyreach in which system looks for packages