diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2009-05-15 14:02:08 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-05-15 14:02:08 +0000 |
commit | f4499c0b24d7777e15d9a689d36eec5103d6a28c (patch) | |
tree | 2e1a70b38882f1478addd6b37b2fcee676bb64e4 /setup-webconf.in | |
parent | 55dbfb5af4965fbb7570228fb3e70cae69169599 (diff) | |
download | alpine-conf-f4499c0b24d7777e15d9a689d36eec5103d6a28c.tar.bz2 alpine-conf-f4499c0b24d7777e15d9a689d36eec5103d6a28c.tar.xz |
setup-webconf: fixed some issues with 1.9
Diffstat (limited to 'setup-webconf.in')
-rw-r--r-- | setup-webconf.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/setup-webconf.in b/setup-webconf.in index bdb4aeb..849e683 100644 --- a/setup-webconf.in +++ b/setup-webconf.in @@ -7,16 +7,15 @@ PREFIX= . $PREFIX/lib/libalpine.sh usage() { - echo "$PROGRAM [-adh] [-l address] [PACKAGE...]" + echo "$PROGRAM [-ah] [-l address] [PACKAGE...]" exit 0; } pkgs="acf-core acf-alpine-baselayout acf-apk-tools" -while getopts "adhl:" opt ; do +while getopts "ahl:" opt ; do case $opt in a) pkgs=`apk_fetch -l | grep ^acf-`;; - d) pkgs="$pkgs acf-devtools";; h) usage;; l) address="$OPTARG";; *) usage;; @@ -33,6 +32,9 @@ done apk_add mini_httpd $pkgs || exit 1 # setup mini_httpd and start it +if [ -d /var/www/localhost/htdocs ]; then + mv /var/www/localhost/htdocs /var/www/localhost/htdocs.old +fi mkdir -p /var/www/localhost/ ln -s /usr/share/acf/www/ /var/www/localhost/htdocs lbu add /var/www/localhost/htdocs @@ -93,6 +95,6 @@ MINI_HTTPD_DOCROOT=/var/www/localhost/htdocs EOF pidof mini_httpd >/dev/null && /etc/init.d/mini_httpd stop -rc_add -k mini_httpd +rc-update add mini_httpd default /etc/init.d/mini_httpd start |