From cbb307f369ee869a15383020a8ed36274d819c83 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Fri, 4 Feb 2022 14:00:07 +0100 Subject: Rev: 4828 --- .../mayor-installer-orig/install.d/05checkdeb.sh | 18 +++++++++++++++--- mayor-orig/mayor-installer-orig/install.d/20mysql.sh | 14 +++++++++++++- .../mayor-installer-orig/install.d/45intezmeny.sh | 2 ++ .../mayor-installer-orig/log/mayor-installer.rev | 2 +- mayor-orig/mayor-installer-orig/setup | 3 ++- 5 files changed, 33 insertions(+), 6 deletions(-) (limited to 'mayor-orig/mayor-installer-orig') diff --git a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh index dbdb49b3..dc3aac2f 100755 --- a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh +++ b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh @@ -26,7 +26,8 @@ echo "Ubuntu:" ${UBUNTU} echo "Version:" ${RELEASE} TEST=`grep contrib /etc/apt/sources.list` -if [ "$TEST" == "" ] +TEST2=`grep contrib /etc/apt/sources.list.d/*` +if [ "$TEST" == "" ] && [ "$TEST2" == "" ] then echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo "Az apt sources.list módosítása szükséges!" @@ -35,20 +36,31 @@ then deb http://ftp.hu.debian.org/debian/ jessie main contrib non-free deb http://security.debian.org/ jessie/updates main contrib non-free deb http://ftp.hu.debian.org/debian/ jessie-updates main contrib non-free + " + echo "Debian Bullseye (11) esetén például: + deb http://ftp.debian.org/debian/ bullseye main contrib non-free + deb http://ftp.debian.org/debian/ bullseye-updates main contrib non-free " fi exit 255; fi -if [[ "x${RELEASE}" =~ ^x9.* ]] +if [[ "x${RELEASE}" =~ ^x8.* ]] +then + PKGS="apache2 php5 php5-json php5-mysqlnd php5-ldap php5-mcrypt php5-curl mysql-server recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ttf-mscorefonts-installer ntp wget ssl-cert ssh pwgen texlive-lang-european texlive-lang-hungarian" +elif [[ "x${RELEASE}" =~ ^x9.* ]] then PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-mcrypt php-curl mariadb-server-10.1 recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ntp wget ssl-cert ssh pwgen texlive-lang-european" elif [[ "x${RELEASE}" =~ ^x10.* ]] then ## PHP 7.2-től php-mcrypt deprecated --> kivettük, de a kódban még van... PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-curl php-bcmath mariadb-server-10.3 recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ntp wget ssl-cert ssh pwgen texlive-lang-european ghostscript" +elif [[ "x${RELEASE}" =~ ^x11.* ]] +then + PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-curl php-bcmath mariadb-server recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex wget ssl-cert ssh pwgen texlive-lang-european ghostscript" else - PKGS="apache2 php5 php5-json php5-mysqlnd php5-ldap php5-mcrypt php5-curl mysql-server recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ttf-mscorefonts-installer ntp wget ssl-cert ssh pwgen texlive-lang-european texlive-lang-hungarian" + echo "Nem tudom meghatározni, milyen csomagokat telepítsünk. Kilépek. :(" + exit 1 fi if [ "$1" == "--no-deb" ]; then diff --git a/mayor-orig/mayor-installer-orig/install.d/20mysql.sh b/mayor-orig/mayor-installer-orig/install.d/20mysql.sh index 3d0175c8..fd8efec8 100755 --- a/mayor-orig/mayor-installer-orig/install.d/20mysql.sh +++ b/mayor-orig/mayor-installer-orig/install.d/20mysql.sh @@ -18,7 +18,13 @@ echo -e "\nMySQL beállítások" echo -n " utf8.cnf ... " cp -f $MAYORDIR/install/base/mysql/utf8.cnf /etc/mysql/conf.d echo ok -/etc/init.d/mysql restart + +if [ -f "/etc/init.d/mysql" ]; then + /etc/init.d/mysql restart +fi +if [ -f "/etc/init.d/mariadb" ]; then + /etc/init.d/mariadb restart +fi if [ "x${RELEASE}" == "x9" ] then @@ -32,3 +38,9 @@ then echo -n " futtatom a mysql_Secure_installation scriptet: " mysql_secure_installation fi +if [ "x${RELEASE}" == "x11" ] +then + echo -e "\nMariaDB/MySQL beállítások" + echo -n " futtatom a mysql_secure_installation scriptet: " + mysql_secure_installation +fi diff --git a/mayor-orig/mayor-installer-orig/install.d/45intezmeny.sh b/mayor-orig/mayor-installer-orig/install.d/45intezmeny.sh index fc8eafeb..d1a15ac5 100755 --- a/mayor-orig/mayor-installer-orig/install.d/45intezmeny.sh +++ b/mayor-orig/mayor-installer-orig/install.d/45intezmeny.sh @@ -17,6 +17,8 @@ Ehhez meg kell adnia az intézmény OM kódját, nevét és rövid nevét EOF +echo "Használt nyelvi beállítás: " $LANG + read -n 1 -p "Létrehozzam az intézményt? (i/N)" -s DO if [ "$DO" != "i" ]; then echo -e "\nNem hoztam létre az intézményt.\n"; exit; fi diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 84bef267..61dcbb9b 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4825 +4828 diff --git a/mayor-orig/mayor-installer-orig/setup b/mayor-orig/mayor-installer-orig/setup index 3c13a155..74fe9215 100755 --- a/mayor-orig/mayor-installer-orig/setup +++ b/mayor-orig/mayor-installer-orig/setup @@ -1,5 +1,6 @@ #!/bin/bash -clear + +#clear echo "-------------------------------------------" echo " MaYoR Setup " echo "-------------------------------------------" -- cgit v1.2.3