aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-installer-orig
diff options
context:
space:
mode:
authorM.Gergo2020-03-31 19:40:35 +0200
committerM.Gergo2020-03-31 19:40:35 +0200
commit0ba1d0c88b25762d4acb0f4b5425778f0cbc76a9 (patch)
tree967d5c6f8477b2871ae022b9bd56fc9697af4bbd /mayor-orig/mayor-installer-orig
parent2f564886b387ecd47ce4f88cabb26a706a32c56c (diff)
parent4c6b313fae97ccb7eaae75b5d05881f10469e13d (diff)
downloadmayor-0ba1d0c88b25762d4acb0f4b5425778f0cbc76a9.tar.gz
mayor-0ba1d0c88b25762d4acb0f4b5425778f0cbc76a9.zip
Merge branch 'MaYor-dev'
Az eddigi fejlesztések a forrásból -> (devel@mayor.hu)
Diffstat (limited to 'mayor-orig/mayor-installer-orig')
-rwxr-xr-xmayor-orig/mayor-installer-orig/install.d/20mysql.sh6
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
2 files changed, 7 insertions, 1 deletions
diff --git a/mayor-orig/mayor-installer-orig/install.d/20mysql.sh b/mayor-orig/mayor-installer-orig/install.d/20mysql.sh
index 2979f728..3d0175c8 100755
--- a/mayor-orig/mayor-installer-orig/install.d/20mysql.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/20mysql.sh
@@ -26,3 +26,9 @@ then
echo -n " futtatom a mysql_Secure_installation scriptet: "
mysql_secure_installation
fi
+if [ "x${RELEASE}" == "x10" ]
+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/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 7ea43f6c..ff844583 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4638
+4644