rename the apache configuration file from rpki.conf to apache.conf

move files in the portal-gui/apache/ subdirectory up one level

install data files to /usr/local/share/rpki/ rather than the /gui/ subdirectory

make install automatically creates /usr/local/share/rpki/media/ for serving css files needed by the web portal

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

4 files changed, 13 insertions, 19 deletions

diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 5c83dae7..0f3dcb51 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -48,7 +48,7 @@ SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpk
 
 AUX_SCRIPTS =
 
-SETTINGS = portal-gui/settings.py rpki/gui/app/settings.py portal-gui/apache/rpki.wsgi
+SETTINGS = portal-gui/settings.py rpki/gui/app/settings.py portal-gui/rpki.wsgi
 
 all:: ${POW_SO} rpki/relaxng.py myrpki.rng rpki/sql_schemas.py ${SCRIPTS} ${AUX_SCRIPTS} ${SETTINGS}
 
@@ -255,7 +255,7 @@ portal-gui/scripts/rpkigui-response: portal-gui/scripts/rpkigui-response.py
 portal-gui/scripts/rpkigui-import-routes: portal-gui/scripts/rpkigui-import-routes.py
 	${COMPILE_DJANGO}
 
-portal-gui/apache/rpki.wsgi: ${srcdir}/portal-gui/apache/rpki.wsgi.in
+portal-gui/rpki.wsgi: ${srcdir}/portal-gui/rpki.wsgi.in
 	${COMPILE_DJANGO}
 
 portal-gui/settings.py: ${srcdir}/portal-gui/settings.py.in
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in
index 4c3882eb..1b6cdaf4 100644
--- a/rpkid/portal-gui/Makefile.in
+++ b/rpkid/portal-gui/Makefile.in
@@ -21,7 +21,7 @@ WEBUSER=@WEBUSER@
 INSTALL = @INSTALL@
 
 CONFDIR=${DESTDIR}$(localstatedir)/rpki/conf
-INSTDIR=${DESTDIR}$(datarootdir)/rpki/gui
+INSTDIR=${DESTDIR}$(datarootdir)/rpki
 PYTHONPATH=${DESTDIR}${sysconfdir}/rpki
 
 # automatically built sources
@@ -39,7 +39,7 @@ distclean: clean
 edit = sed \
 	     -e 's|@INSTDIR[@]|$(INSTDIR)|g'
 
-apache/rpki.conf: $(srcdir)/apache/rpki.conf.in Makefile
+apache.conf: $(srcdir)/apache.conf.in Makefile
 	$(edit) $@.in > $@
 
 .PHONY: install-perms install-data install
@@ -49,9 +49,10 @@ install-perms:
 	chown -R $(WEBUSER) $(CONFDIR)
 
 install-apache:
-	${INSTALL} -d -m 755 $(INSTDIR)/apache
-	${INSTALL} -m 644 apache/rpki.conf $(INSTDIR)/apache
-	${INSTALL} -m 644 apache/rpki.wsgi $(INSTDIR)/apache
+	${INSTALL} -d -m 755 $(INSTDIR)/media
+	${INSTALL} -m 644 apache.conf $(INSTDIR)
+	${INSTALL} -d -m 755 $(INSTDIR)/wsgi
+	${INSTALL} -m 644 rpki.wsgi $(INSTDIR)/wsgi
 
 install-data: $(BUILD) install-apache
 	mkdir -p ${PYTHONPATH}
diff --git a/rpkid/portal-gui/apache/rpki.conf.in b/rpkid/portal-gui/apache.conf.in
index 5670f8d3..b9ca7a36 100644
--- a/rpkid/portal-gui/apache/rpki.conf.in
+++ b/rpkid/portal-gui/apache.conf.in
@@ -13,21 +13,14 @@
 #
 # Defines the URL to the portal-gui
 #
-WSGIScriptAlias / @INSTDIR@/apache/rpki.wsgi
-<Directory @INSTDIR@/rpkigui>
+WSGIScriptAlias / @INSTDIR@/wsgi/rpki.wsgi
+
+<Directory @INSTDIR@/media>
 Order deny,allow
 Allow from all
 </Directory>
 
-# for use with Django 1.3+
-#Alias /static/ @STATIC_DIR@/
-#<Directory @STATIC_DIR@>
-#Order allow,deny
-#Allow from all
-#</Directory>
-
-# for use with Django 1.2
-#Alias /media/ /var/www/html/media/
-#Alias /site_media/ /var/www/html/media/
+Alias /media/ @INSTDIR@/media/
+Alias /site_media/ @INSTDIR@/media/
 
 # vim:ft=apache
diff --git a/rpkid/portal-gui/apache/rpki.wsgi.in b/rpkid/portal-gui/rpki.wsgi.in
index 8cddef95..8cddef95 100644
--- a/rpkid/portal-gui/apache/rpki.wsgi.in
+++ b/rpkid/portal-gui/rpki.wsgi.in