diff --git a/4.Monitor/1.Install_monitor/0_setup.sh b/4.Monitor/1.Install_monitor/0_setup.sh index 473e4404c64eda61166e74de6c50e5e2bb7a840b..a0c200f992fe5b621d32f55aaa1c827bf8ddd1e8 100755 --- a/4.Monitor/1.Install_monitor/0_setup.sh +++ b/4.Monitor/1.Install_monitor/0_setup.sh @@ -12,3 +12,10 @@ if [[ "${MONITOR_SHELL_PWD}" != "" ]]; then echo -e "${MONITOR_SHELL_PWD}\n${MONITOR_SHELL_PWD}" | passwd -q msmonitor echo -e "\033[1;33mThe msmonitor account password has been set.\033[0m" fi + +# configure nginx +if [[ "${MONITOR_SERVER_NAME}" != "" ]]; then + /root/envsetup/set_app_domain.py mon $MONITOR_SERVER_NAME +fi +nginx -t +service nginx restart diff --git a/6.Miris_Manager/1.Install_Miris_Manager/0_setup.sh b/6.Miris_Manager/1.Install_Miris_Manager/0_setup.sh index df00f264ac6235b09a9c157b7b5d6715a8bd75c5..cc402ce8aec97600740aa9ceb28c606e5e1d2e4f 100755 --- a/6.Miris_Manager/1.Install_Miris_Manager/0_setup.sh +++ b/6.Miris_Manager/1.Install_Miris_Manager/0_setup.sh @@ -2,30 +2,37 @@ source /root/envsetup/global-conf.sh if ( apt-cache madison skyreach | grep "skyreach | " ); then - # install cm - if ( dpkg -s skyreach >/dev/null 2>&1 ); then - DEBIAN_FRONTEND=noninteractive apt-get install -y --reinstall skyreach - else - DEBIAN_FRONTEND=noninteractive apt-get install -y skyreach - fi - # configure nginx - sed -i "s@server_name skyreach;@server_name ${CM_SERVER_NAME};@" /etc/nginx/sites-available/skyreach.conf - service nginx restart - # set sender address - sender="${EMAIL_SENDER}" - if [[ "${sender}" == "" || "${sender}" == "noreply@ubicast.eu" ]]; then - if [[ "${CM_SERVER_NAME}" =~ .*\..* ]]; then - sender="noreply@${CM_SERVER_NAME}" - fi - fi - if [[ "${sender}" != "" && "${sender}" != "noreply@ubicast.eu" ]]; then - echo "Using ${sender} as sender address for CM." - if grep "DEFAULT_FROM_EMAIL" /home/skyreach/htdocs/skyreach_site/settings_override.py >/dev/null; then - sed -i "s?[# ]*DEFAULT_FROM_EMAIL.*?DEFAULT_FROM_EMAIL = '${sender}'?" /home/skyreach/htdocs/skyreach_site/settings_override.py - else - echo "DEFAULT_FROM_EMAIL = '${sender}'" >> /home/skyreach/htdocs/skyreach_site/settings_override.py - fi - fi + echo "The skyreach package is available in APT repositories." else echo "${YELLOW}The skyreach package is not available in APT repositories, install skipped.${NC}" + exit 0 +fi + +# install cm +if ( dpkg -s skyreach >/dev/null 2>&1 ); then + DEBIAN_FRONTEND=noninteractive apt-get install -y --reinstall skyreach +else + DEBIAN_FRONTEND=noninteractive apt-get install -y skyreach +fi +# set sender address +sender="${EMAIL_SENDER}" +if [[ "${sender}" == "" || "${sender}" == "noreply@ubicast.eu" ]]; then + if [[ "${CM_SERVER_NAME}" =~ .*\..* ]]; then + sender="noreply@${CM_SERVER_NAME}" + fi +fi +if [[ "${sender}" != "" && "${sender}" != "noreply@ubicast.eu" ]]; then + echo "Using ${sender} as sender address for CM." + if grep "DEFAULT_FROM_EMAIL" /home/skyreach/htdocs/skyreach_site/settings_override.py >/dev/null; then + sed -i "s?[# ]*DEFAULT_FROM_EMAIL.*?DEFAULT_FROM_EMAIL = '${sender}'?" /home/skyreach/htdocs/skyreach_site/settings_override.py + else + echo "DEFAULT_FROM_EMAIL = '${sender}'" >> /home/skyreach/htdocs/skyreach_site/settings_override.py + fi +fi + +# configure nginx +if [[ "${CM_SERVER_NAME}" != "" ]]; then + /root/envsetup/set_app_domain.py mm $CM_SERVER_NAME fi +nginx -t +service nginx restart diff --git a/set_app_domain.py b/set_app_domain.py index 56427f544939f46bdcf7efbd0244561e998e629f..1b859d3b8cc90a1b7891ca649cc2921ae72a2800 100755 --- a/set_app_domain.py +++ b/set_app_domain.py @@ -13,7 +13,7 @@ from utils import log class SetAppDomain(): - USAGE = '''USAGE: %s [-d] [-f] [-h] [app] <domain> + USAGE = '''USAGE: %s [-d] [-f] [-h] <app> <domain> -d: Debug mode (can be started with non root users). -f: Force mode (to force replacement of configuration even if there are warnings). -h: Show this message.