Install scripts til tri-test-niab'erne opdateret

install.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+set -u
+set -e
+
+for confFile in *_config.cfg 
+do	
+	echo "Reading properties from '${confFile}'"
+	source "${confFile}"
+done
+
+
+echo "Stopping JBoss server instance before deploying"
+
+jboss_pid=$(/pack/jdk/bin/jps -l | grep jboss | cut -d " " -f 1) || true
+if [ -n "${jboss_pid}" ]; then
+	echo "Stopping jboss"
+	/etc/init.d/jboss stop || true
+
+
+	jboss_pid_2=$(/pack/jdk/bin/jps -l | grep jboss | cut -d " " -f 1) || true
+	if [ -n "${jboss_pid_2}" ]; then
+		echo "Shutdown of jboss failed, killing process"
+		kill -9 ${jboss_pid_2}
+	fi
+fi
+
+
+echo "Clearing JBoss log directory: '${jboss_log_dir}'"
+rm -f ${jboss_log_dir}/*
+
+
+for file in *_*_install.sh
+do
+ # do something on "$file"
+ 	echo "Executing file: ${file}"
+	source "${file}"
+done
+
+echo "Copying properties to jboss conf folder"
+find conf/ -name "[^\.]*.properties" -exec cp {} ${jboss_conf_dir}/ \;
+
+
+# Recreate the original properties so the installer can be run again
+for file in conf/*.properties.orig
+do
+ # do something on "$file"
+ new_file_name=${file%.orig}
+ mv -f "${file}" "${new_file_name}"
+done
+
+echo "Copying war files to ${jboss_deploy_dir}"
+cp deploy/* ${jboss_deploy_dir}/
+
+
+echo "Starting jboss"
+/etc/init.d/jboss start
+
+echo
+echo "Done deploying - check the jboss log files in ${jboss_log_dir}"

niab_config.cfg

@@ -0,0 +1,21 @@
+
+db_host_dodi=tri-test-niab81
+db_host_nsp=tri-test-niab82
+
+db_admin_user=root
+db_admin_password=nspnetic
+
+db_username=trifork
+db_password=CrevCuen
+
+db_name_reg_noti=register_notifications
+db_name_stamdata=stamdata
+db_name_followup=followup
+
+jboss_dir=/pack/jboss/server/default/
+jboss_conf_dir=${jboss_dir}/conf
+jboss_conf_url=file:${jboss_conf_dir}/
+jboss_log_dir=${jboss_dir}/log
+jboss_deploy_dir=${jboss_dir}/deploy
+
+mysql_dir=/pack/mysql

sdm_dodi_install.sh

@@ -1,23 +1,8 @@
 #!/bin/bash
 set -e
+set -u
 
-db_host_dodi=tri-test-niab81
-db_host_nsp=tri-test-niab82
 
-
-db_admin_user=root
-db_admin_password=nspnetic
-
-db_username=trifork
-db_password=CrevCuen
-
-jboss_dir=/pack/jboss/server/default/
-jboss_conf_dir=${jboss_dir}/conf
-jboss_conf_url=file:${jboss_conf_dir}/
-jboss_log_dir=${jboss_dir}/log
-jboss_deploy_dir=${jboss_dir}/deploy
-
-mysql_dir=/pack/mysql
 if [ -n "${db_admin_password}" ]; then 
 	mysql_admin_connect="${mysql_dir}/bin/mysql -u ${db_admin_user} -p${db_admin_password}"
 else 
@@ -56,36 +41,8 @@ ${mysql_user_connect} stamdata < sql/stamdata/schema.sql
 
 echo "Replacing jboss.server.config.url placeholder i nspslalog properties with path to jboss conf folder"
 find . -type f -name "nspslalog*.properties" -exec sed -i.orig -e "s|\\\${jboss.server.config.url}|${jboss_conf_url}|g" {} \;
-echo "Copying properties to jboss conf folder"
-find . -type f -name "nspslalog*.properties" -exec cp {} ${jboss_conf_dir}/ \;
-
-echo "Reverting to original nspslalog files"
-for file in conf/nspslalog*.properties.orig
-do
- # do something on "$file"
- new_file_name=${file%.orig}
- mv -f "${file}" "${new_file_name}"
-done
-
-
-jboss_pid=$(/pack/jdk/bin/jps -l | grep jboss | cut -d " " -f 1) || true
-if [ -n "${jboss_pid}" ]; then
-	echo "Stopping jboss"
-	/etc/init.d/jboss stop || true
-
-
-	jboss_pid_2=$(/pack/jdk/bin/jps -l | grep jboss | cut -d " " -f 1) || true
-	if [ -n "${jboss_pid_2}" ]; then
-		echo "Shutdown of jboss failed, killing process"
-		kill -9 ${jboss_pid_2}
-	fi
-fi
 
-rm ${jboss_log_dir}/*
-cp deploy/* ${jboss_deploy_dir}/
 
-echo "Starting jboss"
-/etc/init.d/jboss start
+echo "Please verify that only the archives you expect to exist in the deploy dir is there"
+find ${jboss_deploy_dir}/ -name "*.war"
 
-echo
-echo "Done deploying - check the jboss log files in ${jboss_log_dir}"

sdm_nsp_install.sh

@@ -1,23 +1,8 @@
 #!/bin/bash
 set -e
+set -u
 
-db_host_dodi=tri-test-niab81
-db_host_nsp=tri-test-niab82
 
-
-db_admin_user=root
-db_admin_password=nspnetic
-
-db_username=trifork
-db_password=CrevCuen
-
-jboss_dir=/pack/jboss/server/default/
-jboss_conf_dir=${jboss_dir}/conf
-jboss_conf_url=file:${jboss_conf_dir}/
-jboss_log_dir=${jboss_dir}/log
-jboss_deploy_dir=${jboss_dir}/deploy
-
-mysql_dir=/pack/mysql
 if [ -n "${db_admin_password}" ]; then 
 	mysql_admin_connect="${mysql_dir}/bin/mysql -u ${db_admin_user} -p${db_admin_password}"
 else 
@@ -59,35 +44,8 @@ fi
 
 echo "Replacing jboss.server.config.url placeholder i nspslalog properties with path to jboss conf folder"
 find . -type f -name "nspslalog*.properties" -exec sed -i.orig -e "s|\\\${jboss.server.config.url}|${jboss_conf_url}|g" {} \;
-echo "Copying properties to jboss conf folder"
-find . -type f -name "nspslalog*.properties" -exec cp {} ${jboss_conf_dir}/ \;
-
-echo "Reverting to original nspslalog files"
-for file in conf/nspslalog*.properties.orig
-do
- # do something on "$file"
- new_file_name=${file%.orig}
- mv -f "${file}" "${new_file_name}"
-done
-
-jboss_pid=$(/pack/jdk/bin/jps -l | grep jboss | cut -d " " -f 1) || true
-if [ -n "${jboss_pid}" ]; then
-	echo "Stopping jboss"
-	/etc/init.d/jboss stop || true
-
-
-	jboss_pid_2=$(/pack/jdk/bin/jps -l | grep jboss | cut -d " " -f 1) || true
-	if [ -n "${jboss_pid_2}" ]; then
-		echo "Shutdown of jboss failed, killing process"
-		kill -9 ${jboss_pid_2}
-	fi
-fi
 
-rm ${jboss_log_dir}/*
-cp deploy/* ${jboss_deploy_dir}/
 
-echo "Starting jboss"
-/etc/init.d/jboss start
+echo "Please verify that only the archives you expect to exist in the deploy dir is there"
+find ${jboss_deploy_dir}/ -name "*.war"
 
-echo
-echo "Done deploying - check the jboss log files in ${jboss_log_dir}"

sdm_package.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
 set -e
+set -u
 
-db_host_dodi=tri-test-niab81
-db_host_nsp=tri-test-niab82
+if [ -f "niab_config.cfg" ]; then
+	source niab_config.cfg
+fi
 
 
-db_username=trifork
-db_password=CrevCuen
-
 install_dir=_install
 rm -rf ${install_dir}/*
 
@@ -41,6 +40,10 @@ mkdir -p ${nsp_sql_stamdata_dir}
 
 cp sdm_nsp_install.sh ${nsp_install_dir}
 cp sdm_dodi_install.sh ${dodi_install_dir}
+cp niab_config.cfg ${nsp_install_dir}
+cp niab_config.cfg ${dodi_install_dir}
+cp install.sh ${nsp_install_dir}
+cp install.sh ${dodi_install_dir}
 
 ## On both DoDi-db and NSP-db
 echo "CREATE USER '${db_username}'@'%' IDENTIFIED BY '${db_password}';" > ${nsp_sql_dir}/create_trifork_mysql_user.sql
@@ -142,8 +145,15 @@ echo "Copying files to vm's"
 scp sdm_${dodi_dir}.tar.gz ${db_host_dodi}:~
 scp sdm_${nsp_dir}.tar.gz ${db_host_nsp}:~
 
+ssh ${db_host_dodi} "tar zxf sdm_${dodi_dir}.tar.gz"
+#echo "Installing SDM Data Manager on DODI System"
+#ssh ${db_host_dodi} "cd ${dodi_dir};sudo ./sdm_dodi_install.sh"
+
+ssh ${db_host_nsp} "tar zxf sdm_${nsp_dir}.tar.gz"
+#echo "Installing SDM Components on NSP System"
+#ssh ${db_host_nsp} "cd ${nsp_dir};sudo ./sdm_nsp_install.sh"
 
 echo
 echo "Files uploaded to ${db_host_dodi} and ${db_host_nsp} 
-	- Log in to the systems and extract the tar.gz files
-	- Go into the created folder and execute the *_install.sh scripts" 
+	- Log in to the systems, go to the ${dodi_dir} or ${nsp_dir} folder 
+	- and execute the sdm_*_install.sh scripts using sudo"