summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2008-08-28 14:37:20 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2008-08-28 14:37:20 +0000
commit45aaa48404d4d7a5d653c6c8012bf0dba5178bfd (patch)
tree3d6a8ccfea0433c96470ba67213a17823263aff0
parenta74bb7dd0670414a8cfd7262038435d5f7209024 (diff)
downloadalpine-conf-45aaa48404d4d7a5d653c6c8012bf0dba5178bfd.tar.bz2
alpine-conf-45aaa48404d4d7a5d653c6c8012bf0dba5178bfd.tar.xz
release 1.7.
support for setup-webconf -l to specify listen address for web server
-rw-r--r--Makefile2
-rw-r--r--setup-webconf8
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5da4e81..6d68f29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=1.6.1
+V=1.7
P=alpine-conf
PV=$(P)-$(V)
APKF=$(PV).apk
diff --git a/setup-webconf b/setup-webconf
index 798cdd5..fc34fca 100644
--- a/setup-webconf
+++ b/setup-webconf
@@ -7,17 +7,18 @@ PREFIX=
. $PREFIX/lib/libalpine.sh
usage() {
- echo "$PROGRAM [-adh] [PACKAGE...]"
+ echo "$PROGRAM [-adh] [-l address] [PACKAGE...]"
exit 0;
}
pkgs="acf-core acf-alpine-baselayout"
-while getopts "adh" opt ; do
+while getopts "adhl:" opt ; do
case $opt in
a) pkgs=`apk_fetch -l | grep ^acf-`;;
d) pkgs="$pkgs acf-devtools";;
h) usage;;
+ l) address="$OPTARG";;
*) usage;;
esac
done
@@ -102,6 +103,9 @@ certfile=$PEMFILE
port=443
ssl
EOF
+if [ -n "$address" ]; then
+ echo "host=$address" >> /etc/mini_httpd.conf
+fi
cat >/etc/conf.d/mini_httpd <<EOF
MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf"