Move web content from /var/www to /usr/share

hub/Makefile

@@ -6,7 +6,7 @@ PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
 PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
 PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
 
-SERVERDIR = /var/www/koji-hub
+SERVERDIR = /usr/share/koji-hub
 PYFILES = $(wildcard *.py)
 
 _default:

hub/httpd.conf

@@ -2,10 +2,10 @@
 # koji-hub is an xmlrpc interface to the Koji database
 #
 
-Alias /kojihub "/var/www/koji-hub/XMLRPC"
-Alias /koji-hub "/var/www/koji-hub/XMLRPC"
+Alias /kojihub "/usr/share/koji-hub/XMLRPC"
+Alias /koji-hub "/usr/share/koji-hub/XMLRPC"
 
-<Directory /var/www/koji-hub>
+<Directory /usr/share/koji-hub>
         SetHandler mod_python
         PythonHandler kojixmlrpc
         PythonOption DBName koji

koji.spec

@@ -2,7 +2,7 @@
 
 %define testbuild 0
 
-%define baserelease 6
+%define baserelease 7
 %if %{testbuild}
 %define release %{baserelease}.%(date +%%Y%%m%%d.%%H%%M.%%S)
 %else
@@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files hub
 %defattr(-,root,root)
-%{_var}/www/koji-hub
+%{_datadir}/koji-hub
 %config(noreplace) /etc/httpd/conf.d/kojihub.conf
 
 %files utils
@@ -113,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files web
 %defattr(-,root,root)
-%{_var}/www/koji-web
+%{_datadir}/koji-web
 %config(noreplace) /etc/httpd/conf.d/kojiweb.conf
 
 %files builder
@@ -147,6 +147,9 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Tue Feb 20 2007 Jesse Keating <jkeating@redhat.com> - 0.9.5-7
+- Move web files from /var/www to /usr/share
+
 * Mon Feb 19 2007 Jesse Keating <jkeating@redhat.com> - 0.9.5-6
 - Clean up spec for package review
 

www/Makefile

@@ -14,7 +14,7 @@ install:
 		exit 1; \
 	fi
 
-	mkdir -p $(DESTDIR)/var/www/koji-web
+	mkdir -p $(DESTDIR)/usr/share/koji-web
 
 	for d in $(SUBDIRS); do make DESTDIR=$(DESTDIR) \
 		-C $$d install; [ $$? = 0 ] || exit 1; done

www/conf/kojiweb.conf

@@ -1,6 +1,6 @@
-Alias /koji "/var/www/koji-web/scripts/"
+Alias /koji "/usr/share/koji-web/scripts/"
 
-<Directory "/var/www/koji-web/scripts/">
+<Directory "/usr/share/koji-web/scripts/">
     # Config for the publisher handler
     SetHandler mod_python
     PythonHandler mod_python.publisher
@@ -16,7 +16,7 @@ Alias /koji "/var/www/koji-web/scripts/"
     PythonOption LoginTimeout 72
     # This must be changed before deployment
     PythonOption Secret CHANGE_ME
-    PythonPath "sys.path + ['/var/www/koji-web/lib']"
+    PythonPath "sys.path + ['/usr/share/koji-web/lib']"
     PythonCleanupHandler kojiweb.handlers::cleanup
     PythonAutoReload Off
 </Directory>
@@ -35,9 +35,9 @@ Alias /koji "/var/www/koji-web/scripts/"
     ErrorDocument 401 /koji-static/errors/unauthorized.html
 </Location>
 
-Alias /koji-static/ "/var/www/koji-web/static/"
+Alias /koji-static/ "/usr/share/koji-web/static/"
 
-<Directory "/var/www/koji-web/static/">
+<Directory "/usr/share/koji-web/static/">
     Options None
     AllowOverride None
     Order allow,deny

www/kojiweb/Makefile

@@ -1,6 +1,6 @@
 SUBDIRS = includes
 
-SERVERDIR = /var/www/koji-web/scripts
+SERVERDIR = /usr/share/koji-web/scripts
 FILES = $(wildcard *.py *.chtml)
 
 _default:

www/lib/Makefile

@@ -1,6 +1,6 @@
 SUBDIRS = kojiweb
 
-SERVERDIR = /var/www/koji-web/lib
+SERVERDIR = /usr/share/koji-web/lib
 
 _default:
 	@echo "nothing to make.  try make install"

www/static/Makefile

@@ -1,6 +1,6 @@
 SUBDIRS = images errors js
 
-SERVERDIR = /var/www/koji-web/static
+SERVERDIR = /usr/share/koji-web/static
 FILES = $(wildcard *.css)
 
 _default: