diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2008-06-30 09:25:05 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2008-06-30 09:25:05 +0000 |
| commit | 9698b6f2488fcc109acccb150a9bbfde5f49c527 (patch) | |
| tree | 36161a85d9be537cf600a25f971bcf047c5d968b | |
| parent | 2b2d1dd330de29c9e798f03fd8581cf555085afa (diff) | |
| download | alpine-conf-9698b6f2488fcc109acccb150a9bbfde5f49c527.zip | |
bugfixes in setup-web
| -rw-r--r-- | setup-alpine-web | 2 | ||||
| -rw-r--r-- | setup-webconf | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/setup-alpine-web b/setup-alpine-web index 1573c85..ca98d1f 100644 --- a/setup-alpine-web +++ b/setup-alpine-web @@ -59,7 +59,7 @@ do_setup() { /etc/init.d/syslog start /etc/init.d/dhcpd start - FORCE_SETUP_WEBCONF=yes setup-webconf apk "$@" + FORCE_SETUP_WEBCONF=yes setup-webconf "$@" # set up http listener/forwarder mkdir -p /var/www/redirect diff --git a/setup-webconf b/setup-webconf index 1776577..798cdd5 100644 --- a/setup-webconf +++ b/setup-webconf @@ -67,7 +67,7 @@ if [ -f $PEMFILE ]; then echo "$PEMFILE already exist." else mkdir -p $SSLDIR -cat <<EOF >$SSLCNF +cat >$SSLCNF <<EOF [ req ] default_bits = 1024 encrypt_key = yes @@ -92,7 +92,7 @@ EOF mv $CRTFILE $PEMFILE fi -cat <<EOF >/etc/mini_httpd.conf +cat >/etc/mini_httpd.conf <<EOF nochroot dir=/var/www/localhost/htdocs user=nobody @@ -103,7 +103,7 @@ port=443 ssl EOF -cat <<EOF >/etc/conf.d/mini_httpd +cat >/etc/conf.d/mini_httpd <<EOF MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf" MINI_HTTPD_DOCROOT=/var/www/localhost/htdocs EOF |