summaryrefslogtreecommitdiffstats
path: root/satellit_installer/includes
diff options
context:
space:
mode:
authorChristian Rößler2016-12-15 16:24:40 +0100
committerChristian Rößler2016-12-15 16:24:40 +0100
commita2a39b93eb7a801274051c70bf53ef185c96d6c9 (patch)
tree8108a080a0e341297f5c67a37414bf4c70b1784e /satellit_installer/includes
parent[SSPS] php children: Some stoopid bugs fixed (diff)
downloadsetup-scripts-a2a39b93eb7a801274051c70bf53ef185c96d6c9.tar.gz
setup-scripts-a2a39b93eb7a801274051c70bf53ef185c96d6c9.tar.xz
setup-scripts-a2a39b93eb7a801274051c70bf53ef185c96d6c9.zip
[SSPS] php children: Some cosmetics
Diffstat (limited to 'satellit_installer/includes')
-rw-r--r--satellit_installer/includes/10-configurations.inc6
-rw-r--r--satellit_installer/includes/50-copyscripts.inc2
2 files changed, 6 insertions, 2 deletions
diff --git a/satellit_installer/includes/10-configurations.inc b/satellit_installer/includes/10-configurations.inc
index 9047141..beccf13 100644
--- a/satellit_installer/includes/10-configurations.inc
+++ b/satellit_installer/includes/10-configurations.inc
@@ -42,19 +42,21 @@ patch_lighttpd_config() {
[ ! -h 15-fastcgi-php.conf ] && ln -s ../conf-available/15-fastcgi-php.conf
# Increase php threads
- echo -n "# Patching lighttpd service file..."
+ echo -n "# Looking for lighttpd service file..."
if [ -f /lib/systemd/system/lighttpd.service ]; then
# service file found, patching dynamic php children value at system start via patchfile
# see includes/50-copyscripts.inc for dropping patch file /usr/local/sbin/patch_lightdm_phpchildren
if ! grep -q patch_lightdm_phpchildren /lib/systemd/system/lighttpd.service; then
+ echo -n " patching service file ... "
sed -i 's#\[Service\]#\[Service\]\nExecStartPre=\-/usr/local/sbin/patch_lightdm_phpchildren#g' \
/lib/systemd/system/lighttpd.service
fi
else
# service file not found, going old static way
+ echo -n " not found. Doing old, static way (PHP_FCGI_CHILDREN = 32). Please check... ".
sed -i 's/"PHP_FCGI_CHILDREN.*$/"PHP_FCGI_CHILDREN" => "32",/' "15-fastcgi-php.conf"
fi
-
+ echo " done."
mkdir -p "$1" || perror "Could not create $1."
}
diff --git a/satellit_installer/includes/50-copyscripts.inc b/satellit_installer/includes/50-copyscripts.inc
index 2c4694c..ec32194 100644
--- a/satellit_installer/includes/50-copyscripts.inc
+++ b/satellit_installer/includes/50-copyscripts.inc
@@ -12,6 +12,7 @@ install_config_static_ip() {
}
install_lighttpd_phpchild() {
+ echo -n "# Dropping patch_lightdm_phpchildren script..."
cat > /usr/local/sbin/patch_lightdm_phpchildren <<-HEREDOC
#!/bin/bash
@@ -29,6 +30,7 @@ install_lighttpd_phpchild() {
exit 0
HEREDOC
chmod u+x /usr/local/sbin/patch_lightdm_phpchildren
+ echo " done."
}
install_slxlog() {