Merge branch 'devel' of https://github.com/dtu-compute/dtu-enote-installer into devel

installer.sh

@@ -56,6 +56,7 @@ iptables -A INPUT -p tcp --dport  22 -j ACCEPT
 iptables -A INPUT -p tcp --dport    80 -j ACCEPT
 iptables -A INPUT -p udp --dport   123 -j ACCEPT
 iptables -A INPUT -p tcp --dport   443 -j ACCEPT
+iptables -A INPUT -p udp --dport 60000 -j ACCEPT
 #-------------------------------------------------------------------------------
 yum -y install ntp
 timedatectl set-timezone Europe/Copenhagen
@@ -78,6 +79,10 @@ yum -y update
 # Dependencies for ruby scripts in dtu-enote run.sh
 yum -y install ruby ruby-devel rubygem-bundler \
                make gcc gcc-c++ zlib-devel rpm-build git
+
+yum -y install yum-utils epel-release
+yum-config-manager --disable epel
+yum --enablerepo=epel install -y mosh
 #-------------------------------------------------------------------------------
 docker stop $(docker ps -a -q)
 systemctl stop docker
@@ -95,7 +100,7 @@ yum -y install docker-engine
 systemctl start docker
 systemctl enable docker
 
-curl -L https://github.com/docker/compose/releases/download/1.19.0-rc3/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+curl -L https://github.com/docker/compose/releases/download/1.21.2/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose
 ln -s /usr/local/bin/docker-compose /usr/bin/Docker
 docker-compose > /dev/null 2>&1
@@ -140,6 +145,7 @@ pull_or_clone dtu-enote-sharelatex dtu-enote-sharelatex $branch
 pull_or_clone dtu-enote-website dtu-enote-website $branch
 pull_or_clone dtu-enote-chat dtu-enote-chat $branch
 pull_or_clone dtu-quiz dtu-quiz $branch
+pull_or_clone dtu-enote-chat dtu-quiz $branch
 popd
 #-------------------------------------------------------------------------------
 docker build src/dtu-enote-cndumper -t cndumper

valid_config.sh

@@ -16,11 +16,6 @@ if ! [[ -f ${CONFIG_ROOT}/config/cn-dumper.yaml ]]; then
   exit 0
 fi
 
-if ! [[ -f ${CONFIG_ROOT}/config/cn-dumper-dups.yaml ]]; then
-  echo "${CONFIG_ROOT}/config/cn-dumper-dups.yaml does not exist"
-  exit 0
-fi
-
 if ! [[ -f ${CONFIG_ROOT}/config/courses.yaml ]]; then
   echo "${CONFIG_ROOT}/config/courses.yaml does not exist"
   exit 0
@@ -43,11 +38,10 @@ do
 done
 
 coursewebs=$(for i in ${courses[*]}; do printf "${i}-enote${url_suffix} "; done)
-coursesharelatexes=$(for i in ${courses[*]}; do printf "sharelatex-${i}-enote${url_suffix} "; done)
 
-domains=( "stackedit$url_suffix" "enote$url_suffix" "quiz$url_suffix" "letsencrypt$url_suffix" )
+domains=( "enote$url_suffix" "quiz$url_suffix" )
 
-alldomains=( "${domains[@]}" "${coursewebs[@]}" "${coursesharelatexes[@]}" )
+alldomains=( "${domains[@]}" "${coursewebs[@]}" )
 
 echo "Verifying the existence of domains with suffix ${url_suffix} domains ${alldomains[@]}"