web portal no longer needs to write files in ${localstatedir}

svn path=/branches/tk161/; revision=4198

5 files changed, 0 insertions, 41 deletions

diff --git a/configure b/configure
index e2db7fc6..c15c6db1 100755
--- a/configure
+++ b/configure
@@ -640,7 +640,6 @@ LIBOBJS
 DJANGO_ADMIN
 DJANGO_DIR
 SECRET_KEY
-WEBUSER
 OPENSSL_SO_GLOB
 OPENSSL_CONFIG_COMMAND
 RPKID_SUBDIRS
@@ -4929,22 +4928,6 @@ fi
 
 if test $build_django = yes
 then
-	# the user that the apache process is running as
-	if test "x$WEBUSER" = "x"; then
-		for u in apache www-data www; do
-			if $GREP $u /etc/passwd >/dev/null 2>&1; then
-				WEBUSER=$u
-				break
-			fi
-		done
-		if test "x$WEBUSER" = "x"; then
-			{ { $as_echo "$as_me:$LINENO: error: Could not determine which user the apache process runs as.  Please specify WEBUSER=<USERNAME>." >&5
-$as_echo "$as_me: error: Could not determine which user the apache process runs as.  Please specify WEBUSER=<USERNAME>." >&2;}
-   { (exit 1); exit 1; }; }
-		fi
-	fi
-
-
         # source: http://blog.leosoto.com/2008/04/django-secretkey-generation.html
         SECRET_KEY=`$PYTHON -c 'import random; print "".join(random.choice("abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)") for i in range(50))'`
 
diff --git a/configure.ac b/configure.ac
index 03fe8c4d..03d321c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,20 +394,6 @@ fi
 
 if test $build_django = yes
 then
-	# the user that the apache process is running as
-	if test "x$WEBUSER" = "x"; then
-		for u in apache www-data www; do
-			if $GREP $u /etc/passwd >/dev/null 2>&1; then
-				WEBUSER=$u
-				break
-			fi
-		done
-		if test "x$WEBUSER" = "x"; then
-			AC_MSG_ERROR([Could not determine which user the apache process runs as.  Please specify WEBUSER=<USERNAME>.])
-		fi
-	fi
-	AC_SUBST(WEBUSER)
-
         # source: http://blog.leosoto.com/2008/04/django-secretkey-generation.html
         AC_SUBST(SECRET_KEY, `$PYTHON -c 'import random; print "".join([random.choice("abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)") for i in range(50)])'`)
 
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 0f3dcb51..fb6da2c2 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -4,7 +4,6 @@ SUBDIRS = @RPKID_SUBDIRS@
 PYTHON = @PYTHON@
 
 SECRET_KEY = @SECRET_KEY@
-WEBUSER = @WEBUSER@
 DJANGO_DIR = @DJANGO_DIR@
 
 CFLAGS	= @CFLAGS@
@@ -204,7 +203,6 @@ COMPILE_SETTINGS = \
 	rm -f $@; \
 	AC_SECRET_KEY='${SECRET_KEY}' \
 	AC_LOCALSTATEDIR='${DESTDIR}${localstatedir}' \
-	AC_WEBUSER='${WEBUSER}' \
 	AC_DATAROOTDIR='${DESTDIR}${datarootdir}' \
 	AC_DJANGO_DIR='${DJANGO_DIR}' \
 	AC_SYSCONFDIR='${DESTDIR}${sysconfdir}' \
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in
index d5c72135..a19ec36a 100644
--- a/rpkid/portal-gui/Makefile.in
+++ b/rpkid/portal-gui/Makefile.in
@@ -16,11 +16,8 @@ sbindir=@sbindir@
 libexecdir=@libexecdir@
 sysconfdir=@sysconfdir@
 
-WEBUSER=@WEBUSER@
-
 INSTALL = @INSTALL@
 
-CONFDIR=${DESTDIR}$(localstatedir)/rpki/conf
 INSTDIR=${DESTDIR}$(datarootdir)/rpki
 PYTHONPATH=${DESTDIR}${sysconfdir}/rpki
 
@@ -45,8 +42,6 @@ apache.conf: $(srcdir)/apache.conf.in Makefile
 .PHONY: install-perms install-data install
 
 install-perms:
-	mkdir -p $(CONFDIR)
-	chown -R $(WEBUSER) $(CONFDIR)
 
 install-apache:
 	${INSTALL} -m 644 apache.conf $(INSTDIR)
diff --git a/rpkid/rpki/gui/app/settings.py.in b/rpkid/rpki/gui/app/settings.py.in
index 28410f35..5a56a182 100644
--- a/rpkid/rpki/gui/app/settings.py.in
+++ b/rpkid/rpki/gui/app/settings.py.in
@@ -16,7 +16,4 @@ INBOX = settings.MYRPKI if hasattr(settings, 'INBOX') else '%(AC_LOCALSTATEDIR)s
 # maildir-style mailbox where responses to client requests are stored
 OUTBOX = settings.MYRPKI if hasattr(settings, 'OUTBOX') else '%(AC_LOCALSTATEDIR)s/rpki/outbox'
 
-# uid the web server runs as
-WEB_USER = settings.MYRPKI if hasattr(settings, 'WEB_USER') else '%(AC_WEBUSER)s'
-
 RPKI_CONF_TEMPLATE = settings.RPKI_CONF_TEMPLATE = settings.RPKI_CONF_TEMPLATE if hasattr(settings, 'RPKI_CONF_TEMPLATE') else '%(AC_DATAROOTDIR)s/rpki/gui/rpki.conf.template'