From d263f9d2c3b9004efd0df2bcc162816b3f155f0d Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sat, 25 Oct 2008 22:16:40 -0400 Subject: [PATCH] sipb-xen-www -> invirt-web svn path=/trunk/packages/sipb-xen-www/; revision=1318 --- code/Makefile | 2 +- config.todo | 22 ++++++++++++++++++++ debian/changelog | 6 ++++++ debian/control | 8 +++---- debian/invirt-web.cron.d | 8 +++++++ debian/{sipb-xen-www.init => invirt-web.init} | 6 +++--- .../{sipb-xen-www.install => invirt-web.install} | 0 .../{sipb-xen-www.postinst => invirt-web.postinst} | 4 ++-- .../{sipb-xen-www.preinst => invirt-web.preinst} | 4 ++-- debian/{sipb-xen-www.prerm => invirt-web.prerm} | 2 +- debian/rules | 10 +++++++++ debian/sipb-xen-www.cron.d | 8 ------- .../{sipb-xen-repository => invirt-repository} | 0 .../apache2/conf.d/{sipb-xen-www => invirt-web} | 0 files/etc/apache2/sites-available/default | 6 +++--- files/etc/apache2/sites-available/ssl.mako | 8 +++---- 16 files changed, 66 insertions(+), 28 deletions(-) create mode 100644 config.todo create mode 100644 debian/invirt-web.cron.d rename debian/{sipb-xen-www.init => invirt-web.init} (77%) rename debian/{sipb-xen-www.install => invirt-web.install} (100%) rename debian/{sipb-xen-www.postinst => invirt-web.postinst} (96%) rename debian/{sipb-xen-www.preinst => invirt-web.preinst} (89%) rename debian/{sipb-xen-www.prerm => invirt-web.prerm} (96%) delete mode 100644 debian/sipb-xen-www.cron.d rename files/etc/apache2/conf.d/{sipb-xen-repository => invirt-repository} (100%) rename files/etc/apache2/conf.d/{sipb-xen-www => invirt-web} (100%) diff --git a/code/Makefile b/code/Makefile index c1649b6..418289f 100644 --- a/code/Makefile +++ b/code/Makefile @@ -3,7 +3,7 @@ DIRS = templates all: kill chmod compile chmod: - chgrp -R sipb-xen . 2>/dev/null || true + chgrp -R invirt . 2>/dev/null || true chmod -R g+w . 2>/dev/null || true kill: diff --git a/config.todo b/config.todo new file mode 100644 index 0000000..a6abc51 --- /dev/null +++ b/config.todo @@ -0,0 +1,22 @@ +# will differ dev/prod +files/etc/apache2/sites-available/ssl: web hostname +files/etc/apache2/sites-available/svn: web hostname +code/Makefile: base URI + +# may differ dev/prod? +files/etc/apache2/sites-available/default: assumes trac +files/etc/init.d/apache2.invirt: afs cell (for svn?) +code/templates/error.tmpl: xvm@mit.edu +code/templates/help.tmpl: assumes trac +code/templates/list.tmpl: SIPB Virtual Servers +code/templates/skeleton.tmpl: SIPB Virtual Servers (twice) +code/templates/skeleton.tmpl: xvm@mit.edu +code/templates/unauth.tmpl: tons of text +code/templates/unauth.tmpl: https://xvm.mit.edu +code/static/about.html: tons of text +code/static/about.html: SIPB Virtual Servers + +# will take real code to generalize +code/getafsgroups.py: lockers, /mit +code/getafsgroups.py: use of pts for authz +code/main.py: lockers, pts, in help text diff --git a/debian/changelog b/debian/changelog index 40dc80c..27071cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-web (0.0.1) unstable; urgency=low + + * sipb-xen-www -> invirt-web + + -- Greg Price Sat, 25 Oct 2008 22:09:29 -0400 + sipb-xen-www (3.18) unstable; urgency=low * sipb-xen-database-common -> invirt-database diff --git a/debian/control b/debian/control index a6c8ea6..4771238 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ -Source: sipb-xen-www +Source: invirt-web Section: base Priority: extra -Maintainer: SIPB Xen Project +Maintainer: Invirt Project Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, subversion, sipb-xen-base Standards-Version: 3.7.2 -Package: sipb-xen-www +Package: invirt-web Architecture: all Depends: ${misc:Depends}, libapache2-mod-fcgid, python-flup, python-cheetah, python-simplejson, invirt-database, sipb-xen-vnc-client, kstart, debathena-afs-config, sipb-xen-base, libapache2-svn, libapache2-mod-auth-kerb, postfix, subversion, zephyr-clients -Description: Install the sipb-xen-dev website +Description: the Invirt web interface diff --git a/debian/invirt-web.cron.d b/debian/invirt-web.cron.d new file mode 100644 index 0000000..f1ef598 --- /dev/null +++ b/debian/invirt-web.cron.d @@ -0,0 +1,8 @@ +# +# cron-jobs for invirt-web +# Refresh the ACL cache +# + +MAILTO=root + +*/5 * * * * www-data python /var/www/invirt-web/cache_acls.py diff --git a/debian/sipb-xen-www.init b/debian/invirt-web.init similarity index 77% rename from debian/sipb-xen-www.init rename to debian/invirt-web.init index f13ab6d..560eecd 100755 --- a/debian/sipb-xen-www.init +++ b/debian/invirt-web.init @@ -1,15 +1,15 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: sipb-xen-www +# Provides: invirt-web # Required-Start: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: sipb-xen web server +# Short-Description: Invirt web server # Description: ### END INIT INFO -PACKAGE=sipb-xen-www +PACKAGE=invirt-web PARENTPACKAGE=apache2 GEN_FILES=(/etc/apache2/sites-available/{ssl,svn}) diff --git a/debian/sipb-xen-www.install b/debian/invirt-web.install similarity index 100% rename from debian/sipb-xen-www.install rename to debian/invirt-web.install diff --git a/debian/sipb-xen-www.postinst b/debian/invirt-web.postinst similarity index 96% rename from debian/sipb-xen-www.postinst rename to debian/invirt-web.postinst index 7f213a0..9ab1554 100755 --- a/debian/sipb-xen-www.postinst +++ b/debian/invirt-web.postinst @@ -20,9 +20,9 @@ set -e case "$1" in configure) - cd /var/www/sipb-xen-www + cd /var/www/invirt-web make clean && make all - chgrp -R sipb-xen . + chgrp -R invirt . chmod -R g+w . # Our init script proxies all requests Apache's, so Apache's diff --git a/debian/sipb-xen-www.preinst b/debian/invirt-web.preinst similarity index 89% rename from debian/sipb-xen-www.preinst rename to debian/invirt-web.preinst index d5afbad..3245702 100644 --- a/debian/sipb-xen-www.preinst +++ b/debian/invirt-web.preinst @@ -16,8 +16,8 @@ set -e case "$1" in install|upgrade) - if ! getent group sipb-xen > /dev/null; then - addgroup --system sipb-xen + if ! getent group invirt > /dev/null; then + addgroup --system invirt fi ;; diff --git a/debian/sipb-xen-www.prerm b/debian/invirt-web.prerm similarity index 96% rename from debian/sipb-xen-www.prerm rename to debian/invirt-web.prerm index 95dbdf6..f38fe95 100644 --- a/debian/sipb-xen-www.prerm +++ b/debian/invirt-web.prerm @@ -1,5 +1,5 @@ #!/bin/sh -# prerm script for sipb-xen-www +# prerm script for invirt-web # # see: dh_installdeb(1) diff --git a/debian/rules b/debian/rules index e6192f6..b890156 100755 --- a/debian/rules +++ b/debian/rules @@ -1,3 +1,13 @@ #!/usr/bin/make -f +DEB_DIVERT_EXTENSION = .invirt +DEB_DIVERT_FILES_invirt-web += \ + /etc/init.d/apache2 + include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/config-package.mk + +DEB_UPDATE_RCD_PARAMS_invirt-web += defaults 91 9 + +binary-fixup/invirt-web:: + svn co $$(invirt-getconf svn.uri)/trunk/packages/invirt-web/code/ $(DEB_DESTDIR)/var/www/invirt-web diff --git a/debian/sipb-xen-www.cron.d b/debian/sipb-xen-www.cron.d deleted file mode 100644 index 146e0ad..0000000 --- a/debian/sipb-xen-www.cron.d +++ /dev/null @@ -1,8 +0,0 @@ -# -# cron-jobs for sipb-xen-www -# Refresh the ACL cache -# - -MAILTO=root - -*/5 * * * * www-data python /var/www/sipb-xen-www/cache_acls.py diff --git a/files/etc/apache2/conf.d/sipb-xen-repository b/files/etc/apache2/conf.d/invirt-repository similarity index 100% rename from files/etc/apache2/conf.d/sipb-xen-repository rename to files/etc/apache2/conf.d/invirt-repository diff --git a/files/etc/apache2/conf.d/sipb-xen-www b/files/etc/apache2/conf.d/invirt-web similarity index 100% rename from files/etc/apache2/conf.d/sipb-xen-www rename to files/etc/apache2/conf.d/invirt-web diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default index 672526c..ed713a1 100644 --- a/files/etc/apache2/sites-available/default +++ b/files/etc/apache2/sites-available/default @@ -2,8 +2,8 @@ NameVirtualHost *:80 ServerAdmin webmaster@localhost - DocumentRoot /var/www/sipb-xen-www - + DocumentRoot /var/www/invirt-web + Options Indexes FollowSymLinks MultiViews ExecCGI AllowOverride None Order allow,deny @@ -20,7 +20,7 @@ NameVirtualHost *:80 RewriteRule ^/sipb-xen - [L] RewriteRule ^/kill.cgi - [L] RewriteRule ^/~ - [L] - RewriteRule ^/(.*) /var/www/sipb-xen-www/main.fcgi/$1 [L] + RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L] ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ diff --git a/files/etc/apache2/sites-available/ssl.mako b/files/etc/apache2/sites-available/ssl.mako index dfd5af9..b722bfd 100644 --- a/files/etc/apache2/sites-available/ssl.mako +++ b/files/etc/apache2/sites-available/ssl.mako @@ -8,8 +8,8 @@ Listen 442 Listen 446 <%def name="invirt_webinterface()"> - DocumentRoot /var/www/sipb-xen-www - + DocumentRoot /var/www/invirt-web + Options Indexes FollowSymLinks MultiViews ExecCGI AllowOverride None Order allow,deny @@ -31,7 +31,7 @@ ${caller.body()} RewriteRule ^/wiki(.*) - [L] RewriteRule ^/kill.cgi - [L] RewriteRule ^/~ - [L] - RewriteRule ^/(.*) /var/www/sipb-xen-www/main.fcgi/$1 [L] + RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L] RewriteLog /var/log/apache2/rewrite.log RewriteLogLevel 0 @@ -90,7 +90,7 @@ ${caller.body()} ServerAdmin ${errmail} ServerName ${hostname}:446 - DocumentRoot /var/www/sipb-xen-www + DocumentRoot /var/www/invirt-web Options Indexes FollowSymLinks MultiViews ExecCGI AllowOverride None -- 1.7.9.5