summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2021-05-07 10:47:23 +0200
committerSimon Rettberg2021-05-07 10:47:23 +0200
commit5ceb17f8b3d46c263a7f30f50d94e765638548a3 (patch)
tree1fa34453bbd0492d13ed4d30be707158b46ab14d
parent[SSPS] lighttpd: Fix panel api rewrite rule (diff)
downloadsetup-scripts-5ceb17f8b3d46c263a7f30f50d94e765638548a3.tar.gz
setup-scripts-5ceb17f8b3d46c263a7f30f50d94e765638548a3.tar.xz
setup-scripts-5ceb17f8b3d46c263a7f30f50d94e765638548a3.zip
[SSPS] Remove useless function
-rw-r--r--satellit_installer/includes/40-patch_mysql_config.inc17
-rwxr-xr-xsatellit_installer/satellit_installer1
2 files changed, 0 insertions, 18 deletions
diff --git a/satellit_installer/includes/40-patch_mysql_config.inc b/satellit_installer/includes/40-patch_mysql_config.inc
deleted file mode 100644
index ccbf639..0000000
--- a/satellit_installer/includes/40-patch_mysql_config.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# This is a _very_ simple mysql config patcher
-
-patch_mysql_config() {
- echo -n "# Patching utf8 entries into /etc/mysql/my.cnf..."
- cp -p /etc/mysql/my.cnf /etc/mysql/my.cnf.$(date +%Y%m%d%H%M%S)
- if [ $(grep -c '# openslx patch marker #' /etc/mysql/my.cnf) -eq 0 ]; then
- # sed -i 's/\[client\]/\[client\]\ndefault-character-set = utf8/g' /etc/mysql/my.cnf
- # sed -i 's/\[mysql\]/\[mysql\]\ndefault-character-set = utf8/g' /etc/mysql/my.cnf
- sed -i "s#\[mysqld\]#\[mysqld\]\ninit_connect=\'SET collation_connection \= utf8_unicode_ci\'\ninit_connect=\'SET NAMES utf8\'\ncharacter-set-server=utf8\ncollation-server=utf8_unicode_ci\nskip-character-set-client-handshake#g" /etc/mysql/my.cnf
- echo '# openslx patch marker #' >> /etc/mysql/my.cnf
- echo " ok."
- else
- echo " already patched."
- fi
-
-
-}
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index b67d323..8d3fde9 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -107,7 +107,6 @@ install_ipxe "$IPXEDIR"
compile_ipxe "$IPXEDIR" &>/tmp/ipxesuccess &
add_mysql_dbs_users # mysql stuff; adding databases and users
-patch_mysql_config # adding utf8 entries to /etc/mysql/my.cnf
write_tftpd_config