From 034de335ad70d9a68f856a0aa4e7e55d20fc4b8d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 20 Feb 2007 09:51:08 -0500 Subject: [PATCH] Move web content from /var/www to /usr/share --- hub/Makefile | 2 +- hub/httpd.conf | 6 +++--- koji.spec | 9 ++++++--- www/Makefile | 2 +- www/conf/kojiweb.conf | 10 +++++----- www/kojiweb/Makefile | 2 +- www/lib/Makefile | 2 +- www/static/Makefile | 2 +- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/hub/Makefile b/hub/Makefile index 8d8b36d5..3aa773d6 100644 --- a/hub/Makefile +++ b/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: diff --git a/hub/httpd.conf b/hub/httpd.conf index 5d3bd69e..08d9242b 100644 --- a/hub/httpd.conf +++ b/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" - + SetHandler mod_python PythonHandler kojixmlrpc PythonOption DBName koji diff --git a/koji.spec b/koji.spec index 5ee2888b..5e101ff6 100644 --- a/koji.spec +++ b/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 - 0.9.5-7 +- Move web files from /var/www to /usr/share + * Mon Feb 19 2007 Jesse Keating - 0.9.5-6 - Clean up spec for package review diff --git a/www/Makefile b/www/Makefile index 1f76244f..25a89ddb 100644 --- a/www/Makefile +++ b/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 diff --git a/www/conf/kojiweb.conf b/www/conf/kojiweb.conf index 72f005b8..d0a7f27f 100644 --- a/www/conf/kojiweb.conf +++ b/www/conf/kojiweb.conf @@ -1,6 +1,6 @@ -Alias /koji "/var/www/koji-web/scripts/" +Alias /koji "/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 @@ -35,9 +35,9 @@ Alias /koji "/var/www/koji-web/scripts/" ErrorDocument 401 /koji-static/errors/unauthorized.html -Alias /koji-static/ "/var/www/koji-web/static/" +Alias /koji-static/ "/usr/share/koji-web/static/" - + Options None AllowOverride None Order allow,deny diff --git a/www/kojiweb/Makefile b/www/kojiweb/Makefile index 4c6f4c0e..a37f5471 100644 --- a/www/kojiweb/Makefile +++ b/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: diff --git a/www/lib/Makefile b/www/lib/Makefile index 5fb11b51..a0e01a1f 100644 --- a/www/lib/Makefile +++ b/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" diff --git a/www/static/Makefile b/www/static/Makefile index 9b4e2c96..7fb8836f 100644 --- a/www/static/Makefile +++ b/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: