use setup-webconf rather than setup-acf

3 files changed, 81 insertions, 103 deletions

diff --git a/Makefile b/Makefile
index d5a1b2f..88fdc4d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=1.3
+V=1.4
 P=alpine-conf
 PV=$(P)-$(V)
 APKF=$(PV).apk
@@ -9,7 +9,6 @@ TMP=$(PV)
 LIB_FILES=libalpine.sh
 SBIN_FILES=albootstrap\
 	lbu\
-	setup-acf\
 	setup-ads\
 	setup-alpine\
 	setup-cryptswap\
diff --git a/setup-acf b/setup-acf
deleted file mode 100644
index e4f13f7..0000000
--- a/setup-acf
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-PROGRAM=setup-acf
-VERSION=0.1
-
-PREFIX=
-. $PREFIX/lib/libalpine.sh
-
-usage() {
-	echo "$PROGRAM [-adh] [PACKAGE...]"
-	exit 0;
-}
-
-pkgs="acf-core acf-alpine-baselayout"
-
-while getopts "adh" opt ; do
-	case $opt in
-		a) pkgs=`apk_fetch -l | grep ^acf-`;;
-		d) pkgs="$pkgs acf-devtools";;
-		h) usage;;
-		*) usage;;
-	esac
-done
-shift `expr $OPTIND - 1`
-
-while [ $# -gt 0 ]; do
-	pkgs="$pkgs acf-$1"
-	shift
-done
-
-# issue warning so user knows what he is doing
-echo "!!!"
-echo "!!! WARNING !!! WARNING !!! WARNING !!!"
-echo "!!!"
-echo "!!! The webinterface is in alpha stage and will give *anyone* on the"
-echo "!!! network access to your box. The web interface is only for testing"
-echo "!!! purposes and should only be used in isolated secure networks."
-echo "!!!"
-echo "!!! Please send suggestions and patches to acf@lists.alpinelinux.org"
-echo "!!!"
-
-
-echon "Are you sure you want continue? (y/n) [n] "
-default_read  imsure n
-if [ "$imsure" != y ]; then
-	echo "Aborting."
-	exit
-fi
-
-# install packages 
-apk_add mini_httpd $pkgs || exit 1
-
-# setup mini_httpd and start it
-mkdir -p /var/www/localhost/
-ln -s /usr/share/acf/www/ /var/www/localhost/htdocs
-
-
-SSLDIR=/etc/ssl/mini_httpd
-KEYFILE=$SSLDIR/server.key
-CRTFILE=$SSLDIR/server.crt
-PEMFILE=$SSLDIR/server.pem
-
-if [ -f $PEMFILE ]; then
-	echo "$PEMFILE already exist."
-else
-	echo "Generating certificates for HTTPS..."
-	openssl genrsa 2048 > $KEYFILE
-	openssl req -new -x509 -nodes -sha1 -days 3650 -key $KEYFILE > $CRTFILE
-	cat $KEYFILE >> $CRTFILE
-	rm $KEYFILE
-	mv $CRTFILE $PEMFILE
-fi
-
-cat <<EOF >/etc/mini_httpd.conf
-nochroot
-dir=/var/www/localhost/htdocs
-user=nobody
-logfile=/var/log/mini_httpd.log
-cgipat=cgi-bin**
-certfile=$PEMFILE
-port=443
-ssl
-EOF
-
-cat <<EOF >/etc/conf.d/mini_httpd
-MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf"
-MINI_HTTPD_DOCROOT=/var/www/localhost/htdocs
-EOF
-
-pidof mini_httpd >/dev/null && /etc/init.d/mini_httpd stop
-rc_add -k mini_httpd
-/etc/init.d/mini_httpd start
-
diff --git a/setup-webconf b/setup-webconf
index d37bb79..e4f13f7 100644
--- a/setup-webconf
+++ b/setup-webconf
@@ -1,21 +1,93 @@
 #!/bin/sh
 
-# script to set up webconf
+PROGRAM=setup-acf
+VERSION=0.1
 
-apk_add mini_httpd acf-alpine-baselayout
+PREFIX=
+. $PREFIX/lib/libalpine.sh
 
-sed -i 's:MINI_HTTPD_OPTS=.*:MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf":
-	s:#\?MINI_HTTPD_DOCROOT=.*:MINI_HTTPD_DOCROOT=/var/lib/acf/www:
-		' /etc/conf.d/mini_httpd
+usage() {
+	echo "$PROGRAM [-adh] [PACKAGE...]"
+	exit 0;
+}
 
-cat - > /etc/mini_httpd.conf <<EOF
+pkgs="acf-core acf-alpine-baselayout"
+
+while getopts "adh" opt ; do
+	case $opt in
+		a) pkgs=`apk_fetch -l | grep ^acf-`;;
+		d) pkgs="$pkgs acf-devtools";;
+		h) usage;;
+		*) usage;;
+	esac
+done
+shift `expr $OPTIND - 1`
+
+while [ $# -gt 0 ]; do
+	pkgs="$pkgs acf-$1"
+	shift
+done
+
+# issue warning so user knows what he is doing
+echo "!!!"
+echo "!!! WARNING !!! WARNING !!! WARNING !!!"
+echo "!!!"
+echo "!!! The webinterface is in alpha stage and will give *anyone* on the"
+echo "!!! network access to your box. The web interface is only for testing"
+echo "!!! purposes and should only be used in isolated secure networks."
+echo "!!!"
+echo "!!! Please send suggestions and patches to acf@lists.alpinelinux.org"
+echo "!!!"
+
+
+echon "Are you sure you want continue? (y/n) [n] "
+default_read  imsure n
+if [ "$imsure" != y ]; then
+	echo "Aborting."
+	exit
+fi
+
+# install packages 
+apk_add mini_httpd $pkgs || exit 1
+
+# setup mini_httpd and start it
+mkdir -p /var/www/localhost/
+ln -s /usr/share/acf/www/ /var/www/localhost/htdocs
+
+
+SSLDIR=/etc/ssl/mini_httpd
+KEYFILE=$SSLDIR/server.key
+CRTFILE=$SSLDIR/server.crt
+PEMFILE=$SSLDIR/server.pem
+
+if [ -f $PEMFILE ]; then
+	echo "$PEMFILE already exist."
+else
+	echo "Generating certificates for HTTPS..."
+	openssl genrsa 2048 > $KEYFILE
+	openssl req -new -x509 -nodes -sha1 -days 3650 -key $KEYFILE > $CRTFILE
+	cat $KEYFILE >> $CRTFILE
+	rm $KEYFILE
+	mv $CRTFILE $PEMFILE
+fi
+
+cat <<EOF >/etc/mini_httpd.conf
 nochroot
-dir=/var/lib/acf/www
+dir=/var/www/localhost/htdocs
 user=nobody
 logfile=/var/log/mini_httpd.log
 cgipat=cgi-bin**
+certfile=$PEMFILE
+port=443
+ssl
+EOF
 
+cat <<EOF >/etc/conf.d/mini_httpd
+MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf"
+MINI_HTTPD_DOCROOT=/var/www/localhost/htdocs
 EOF
 
-rc_add mini_httpd
+pidof mini_httpd >/dev/null && /etc/init.d/mini_httpd stop
+rc_add -k mini_httpd
 /etc/init.d/mini_httpd start
+