Merge pull request #288 from jburel/centos7

Centos7 removal

linux/README.md

@@ -2,16 +2,15 @@ Example OMERO Linux install scripts
 ===================================
 
 This directory contains examples of installing OMERO on clean
-Ubuntu 18.04, Ubuntu 20.04, Debian 10
-CentOS 7 64-bit systems, see
+Ubuntu 22.04, Ubuntu 20.04, Debian 10, Rocky Linux 9 64-bit systems, see
 https://docs.openmicroscopy.org/latest/omero/sysadmins/unix/server-installation.html
 
 Copy the files from this directory, then run one of the install scripts,
 
-	bash install_centos7.sh
-	bash install_ubuntu1804.sh
+	bash install_ubuntu2204.sh
     bash install_debian10.sh
     bash install_ubuntu2004.sh
+    bash install_rocky9.sh
 
 
 corresponding to the required OS and web platform.
@@ -23,10 +22,10 @@ Documentation generation
 To generate a walkthrough file corresponding to a given OS, run the
 `autogenerate.sh` script, the OS is specified as a parameter e.g.
 
-	OS=ubuntu1804 bash autogenerate.sh
+	OS=ubuntu2204 bash autogenerate.sh
 
 The walkthrough file is used for the omero documention e.g.
-https://docs.openmicroscopy.org/latest/omero/sysadmins/unix/server-centos7-ice36.html
+https://omero.readthedocs.io/en/stable/sysadmins/unix/server-rockylinux9-ice36.html
 but it should not be executed.
 
 To generate all the walkthroughs, run the following command

linux/autogenerate.sh

@@ -14,7 +14,7 @@ echo "${l}"
 
 #generate the walkthrough for all supported os
 function generate_all() {
-	values=(centos7 debian10 ubuntu2004 ubuntu2204 rocky9)
+	values=(debian10 ubuntu2004 ubuntu2204 rocky9)
 	for os in "${values[@]}"; do
   		echo "${os}"
   		 generate ${os}
@@ -38,8 +38,6 @@ if [[ $OS =~ "debian" ]] || [[ $OS =~ "ubuntu" ]] ; then
 	N="ubuntu"
 elif [[ $OS =~ "rocky" ]]  ; then
     N="rocky"
-elif [[ $OS =~ "centos" ]]  ; then
-    N="centos7"
 fi
 echo -en '\n' >> $file
 if ! [[ $OS =~ "rocky" ]]  ; then
@@ -50,9 +48,7 @@ fi
 
 # install java
 N=$OS
-if [[ $OS =~ "centos" ]] ; then
-	N="centos"
-elif [[ $OS =~ "ubuntu1804" ]]  ; then
+if [[ $OS =~ "ubuntu1804" ]]  ; then
 	N="ubuntu1804"
 elif [[ $OS =~ "ubuntu" ]]  ; then
 	N="ubuntu"
@@ -128,24 +124,7 @@ echo -en '\n' >> $file
 N=$OS
 echo -en '\n' >> $file
 echo "# install Postgres" >> $file
-if [[ $N =~ "centos" ]] ; then
-    number=$(sed -n '/#start-postgresql-installation-general/=' $dir/step01_"$OS"_pg_deps.sh)
-    nrs=$((number+1))
-    number=$(sed -n '/#end-postgresql-installation-general/=' $dir/step01_"$OS"_pg_deps.sh)
-    nre=$((number-1))
-    line=$(sed -n ''$nrs','$nre'p' $dir/step01_"$OS"_pg_deps.sh)
-    line="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//')"
-
-    echo "$line"  >> $file
-
-	number=$(sed -n '/#start-recommended/=' $dir/step01_"$OS"_pg_deps.sh)
-	nrs=$((number+1))
-	number=$(sed -n '/#end-recommended/=' $dir/step01_"$OS"_pg_deps.sh)
-	nre=$((number-1))
-	line=$(sed -n ''$nrs','$nre'p' $dir/step01_"$OS"_pg_deps.sh)
-	# remove docker conditional
-	line=`remove_docker_workaround "${line}"`
-elif [[ $OS =~ "rocky" ]]  ; then
+if [[ $OS =~ "rocky" ]]  ; then
     number=$(sed -n '/#start-pg-enabling/=' $dir/step01_rocky9_deps.sh)
     nrs=$((number+1))
     number=$(sed -n '/#end-pg-enabling/=' $dir/step01_rocky9_deps.sh)
@@ -279,40 +258,18 @@ line=$(sed -n ''$ns','$ne'p' $dir/step04_all_omero.sh)
 line=$(echo -e "${line}" | sed -e "s/\-i.bak/-i/g")
 line="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//')"
 echo "$line" >> $file
-if [[ $OS =~ "centos7" ]] ; then
-	echo -en '\n' >> $file
-	number=$(sed -n '/#start-diffie-hellman/=' $dir/step04_centos7_ciphers.sh)
-    ns=$((number))
-    number=$(sed -n '/#end-diffie-hellman/=' $dir/step04_centos7_ciphers.sh)
-    ne=$((number))
-    line=$(sed -n ''$ns','$ne'p' $dir/step04_centos7_ciphers.sh)
-    line="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//')"
-    echo "$line" >> $file
-fi
-
 
 echo -en '\n' >> $file
 
 echo -en '\n' >> $file
 echo "#start-step06: As root, run the scripts to start OMERO automatically" >> $file
 
-if [ $OS = "centos7" ] ; then
-	number=$(sed -n '/#start-recommended/=' $dir/step06_"$OS"_daemon.sh)
-	nrs=$((number+1))
-	number=$(sed -n '/#end-recommended/=' $dir/step06_"$OS"_daemon.sh)
-	nre=$((number-1))
-	line=$(sed -n ''$nrs','$nre'p' $dir/step06_"$OS"_daemon.sh)
-	# remove docker conditional
-	line=`remove_docker_workaround "${line}"`
-	echo "$line" >> $file
-else
-	number=$(sed -n '/#start-recommended/=' $dir/step06_ubuntu_daemon.sh)
-	nrs=$((number+1))
-	number=$(sed -n '/#end-recommended/=' $dir/step06_ubuntu_daemon.sh)
-	nre=$((number-1))
-	line=$(sed -n ''$nrs','$nre'p' $dir/step06_ubuntu_daemon.sh)
-	echo "$line" >> $file
-fi
+number=$(sed -n '/#start-recommended/=' $dir/step06_ubuntu_daemon.sh)
+nrs=$((number+1))
+number=$(sed -n '/#end-recommended/=' $dir/step06_ubuntu_daemon.sh)
+nre=$((number-1))
+line=$(sed -n ''$nrs','$nre'p' $dir/step06_ubuntu_daemon.sh)
+echo "$line" >> $file
 echo "#end-step06" >> $file
 
 echo -en '\n' >> $file
@@ -323,13 +280,6 @@ line=$(sed -n ''$start',$p' $dir/step07_all_perms.sh)
 echo "$line" >> $file
 echo "#end-step07" >> $file
 
-if [[ $OS =~ "centos" ]]; then
-    echo "#start-selinux" >> $file
-    line=$(sed -n '2,$p' $dir/setup_centos_selinux.sh)
-    echo "$line" >> $file
-    echo "#end-selinux" >> $file
-fi
-
 if [[ $OS =~ "rocky" ]]; then
 	echo "#start-step08: As root, configure" >> $file
 	number=$(sed -n '/#start-recommended/=' $dir/step08_rocky9_config.sh)

linux/test/README.md

@@ -51,7 +51,7 @@ To generate a specific walkthrough, run the following command
     OS=debian10 ALL=false bash autogenerate.sh
 
 The possible values are:
-centos7, ubuntu2004, ubuntu2204, debian10, rocky9 (default)
+ubuntu2004, ubuntu2204, debian10, rocky9 (default)
 
 Configuring Java
 ----------------
@@ -95,8 +95,8 @@ pg13, pg14, pg15
 
 If you do not want to install Postgres set PGVER to nopg.
 
-To add a new Postgres version, update the following files: 
-`step01_centos7_pg_deps.sh`,
+To add a new Postgres version, update the following files:
+`step01_rocky9_deps.sh`,
 `step01_ubuntu2004_pg_deps.sh`, `step01_ubuntu2204_pg_deps.sh`,
 `step01_debian10_pg_deps.sh` and update this README.md.