summaryrefslogtreecommitdiffstats
path: root/satellit_installer/includes/10-configurations.inc
diff options
context:
space:
mode:
authorSimon Rettberg2014-11-18 19:37:23 +0100
committerSimon Rettberg2014-11-18 19:37:23 +0100
commit98202109262dae1c46a49a73ba865a041ef7ae16 (patch)
treee57124782ceddac66a4c91c2ab8636c20e4b1d8f /satellit_installer/includes/10-configurations.inc
parent[SSPS] netsetup: Hostname and, if there, Domain to /etc/hosts in static case (diff)
downloadsetup-scripts-98202109262dae1c46a49a73ba865a041ef7ae16.tar.gz
setup-scripts-98202109262dae1c46a49a73ba865a041ef7ae16.tar.xz
setup-scripts-98202109262dae1c46a49a73ba865a041ef7ae16.zip
[SSPS] Add support for enabling HTTPS in lighttpd
Diffstat (limited to 'satellit_installer/includes/10-configurations.inc')
-rw-r--r--satellit_installer/includes/10-configurations.inc13
1 files changed, 6 insertions, 7 deletions
diff --git a/satellit_installer/includes/10-configurations.inc b/satellit_installer/includes/10-configurations.inc
index fe00149..df78153 100644
--- a/satellit_installer/includes/10-configurations.inc
+++ b/satellit_installer/includes/10-configurations.inc
@@ -31,17 +31,16 @@ patch_atftpd_config() {
}
patch_lighttpd_config() {
- echo -n "# Stopping lighttpd server..."
- /etc/init.d/lighttpd stop 2>/dev/null 1>&2
- echo "ok."
+ service lighttpd stop
echo -n "# Patching lighttpd configuration..."
- cp -p /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.$(date +%Y%m%d%H%M%S)
- cp -p "$BASEDIR/static_files/lighttpd.conf" /etc/lighttpd/lighttpd.conf
+ cp -p "$BASEDIR/static_files/lighttpd.conf" /etc/lighttpd/lighttpd.conf || perror "failed"
+ cp -p "$BASEDIR/static_files/lighttpd-auto-ssl.sh" /usr/share/lighttpd/auto-ssl.sh || perror "failed"
+ chmod +x /usr/share/lighttpd/auto-ssl.sh || perror "failed"
echo "ok."
- cd /etc/lighttpd/conf-enabled
+ cd /etc/lighttpd/conf-enabled || perror "Could not cd to conf-enabled"
[ ! -h 10-fastcgi.conf ] && ln -s ../conf-available/10-fastcgi.conf
[ ! -h 15-fastcgi-php.conf ] && ln -s ../conf-available/15-fastcgi-php.conf
- mkdir -p "$1" 2>/dev/null
+ mkdir -p "$1" || perror "Could not create $1"
}
config_nfs() {