wtserver 0.59

distros/debian12/askquestions.sh

@@ -249,6 +249,17 @@ AskQuestions() {
     fi
 
     if [ "$CFG_GITLABINSTALL" == "yes" ]; then
+	CFG_GITLAB_VERSION=$(whiptail --title "GitLab Version" --backtitle "$WT_BACKTITLE" --menu "Choose GitLab version to install:" $WT_HEIGHT $WT_WIDTH 2 \
+	    "1" "GitLab Community Edition (CE)" \
+	    "2" "GitLab Enterprise Edition (EE)" \
+	    3>&1 1>&2 2>&3)
+
+    	if [ "$CFG_GITLAB_VERSION" == "1" ]; then
+	   CFG_GITLAB_VERSION="ce"
+	elif [ "$CFG_GITLAB_VERSION" == "2" ]; then
+	   CFG_GITLAB_VERSION="ee"
+	fi
+    
         echo -n -e "$IDENTATION_LVL_2 ${BBlack}Retrieve Gitlab Admin password${NC}: "
         CFG_GITLAB_ADMIN_PWD=$(whiptail --title "Gitlab" --backtitle "$WT_BACKTITLE" --inputbox "Please specify a Gitlab Admin Password (leave empty for autogenerate)" --nocancel $WT_HEIGHT $WT_WIDTH 3>&1 1>&2 2>&3)
 

distros/debian12/install_gitlab.sh

@@ -3,17 +3,17 @@
 #    Install and configure of Gitlab-ce
 #---------------------------------------------------------------------
 
-InstallGitlabCE() {
-    echo -n "$IDENTATION_LVL_1 Installed Gitlab-ce packages... "
+InstallGitlab() {
+    echo -e "$IDENTATION_LVL_0 Installing Gitlab..."
 
+    echo -n -e "$IDENTATION_LVL_1 Installing required packages... "
     apt_install curl openssh-server ca-certificates postfix apt-transport-https gnupg2 software-properties-common tzdata perl
+    echo -e "[${green}DONE${NC}]"
     
+    echo -n -e "$IDENTATION_LVL_1 Installing Gitlab-$CFG_GITLAB_VERSION... "
     cd /tmp
-    #curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | sudo bash
-    #apt_install gitlab-ce
-
-    curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.deb.sh | sudo bash > /dev/null
-    apt_install gitlab-ee
+    curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-$CFG_GITLAB_VERSION/script.deb.sh | sudo bash >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+    apt_install gitlab-$CFG_GITLAB_VERSION
 
     #external_url 'https://Your_Domain_Name' /etc/gitlab/gitlab.rb
     #letsencrypt[‘contact_emails’] = [‘admin@lx.x’]
@@ -249,5 +249,5 @@ Gitlab mysql root password		: $CFG_GITLAB_ADMIN_PWD
 #----------------------------
 EOF
 
-echo -e "[${green}DONE${NC}]"
+    echo -e "[${green}DONE${NC}]"
 }

distros/debian12/install_ispconfig.sh

@@ -21,7 +21,7 @@ InstallISPConfig() {
     echo -n -e "$IDENTATION_LVL_1 Extracting the downloaded package... "
     cd $PROGRAMS_INSTALL_DOWNLOAD
     tar xfz $PROGRAMS_INSTALL_DOWNLOAD/ISPConfig-*.tar.gz >>$PROGRAMS_INSTALL_LOG_FILES 2>&1
-    AUTO_INSTALL_INI_LOCATION=$PROGRAMS_INSTALL_DOWNLOAD/ispconfig3-install/install
+    AUTO_INSTALL_INI_LOCATION=$PROGRAMS_INSTALL_DOWNLOAD/ispconfig3_install/install
     cd $AUTO_INSTALL_INI_LOCATION
     echo -e "[${green}DONE${NC}]"
   

install.sh

@@ -369,6 +369,10 @@ if [ -f /etc/debian_version ]; then
 
 	InstallWebStats
 
+	if [ "$CFG_GITLABINSTALL" == "yes" ]; then
+		InstallGitlab
+	fi
+	
 	if [ "$CFG_SETUP_MASTER" == "yes" ] || [ "$CFG_MULTISERVER" == "no" ]; then
 		InstallISPConfig
 	fi
@@ -378,10 +382,6 @@ if [ -f /etc/debian_version ]; then
 		#InstallDrupal
 	#fi
 	InstallFix
-	if [ "$CFG_GITLABINSTALL" == "yes" ]; then
-		InstallGitlabCE
-	fi
-	
 
 	echo -e "\n${green}Well done! ISPConfig installed and configured correctly :D${NC} 😃"
 	echo -e "\nNow you can access to your ISPConfig installation at: ${underlined}https://$CFG_HOSTNAME_FQDN:$CFG_ISPONCFIG_PORT${NC} or ${underlined}https://${IP_ADDRESS[0]}:$CFG_ISPONCFIG_PORT${NC}"