From ede52b93c4aa79b35101549c7f0353bad5370b45 Mon Sep 17 00:00:00 2001 From: Greg Brockman Date: Wed, 4 Aug 2010 23:20:35 -0400 Subject: [PATCH] Switch from svn to git --- code/templates/unauth.mako | 6 ++--- debian/changelog | 1 + debian/control | 2 +- debian/invirt-web.init | 2 +- debian/invirt-web.postinst | 2 +- debian/invirt-web.preinst | 4 +++ debian/rules | 5 +++- files/etc/apache2/sites-available/svn.mako | 40 ---------------------------- 8 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 files/etc/apache2/sites-available/svn.mako diff --git a/code/templates/unauth.mako b/code/templates/unauth.mako index c9739d4..35e9bd5 100644 --- a/code/templates/unauth.mako +++ b/code/templates/unauth.mako @@ -51,9 +51,9 @@ href="https://${config.web.hostname}:442/">→The XVM code base is a free software project under development, licensed under GPLv2+. If you're interested in using it, -we'd be happy to help you set it up in your environment. Our Subversion -repository is

https://xvm.mit.edu:1111/
+we'd be happy to help you set it up in your environment. Our Git +repositories are publicly viewable at

http://xvm.mit.edu/gitweb

xvm.mit.edu is provided by SIPB, the student computing group at MIT, with generous funding from Sat, 14 Aug 2010 00:46:44 -0400 diff --git a/debian/control b/debian/control index f2a3f00..9942c8a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: invirt-web Section: base Priority: extra Maintainer: Invirt project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, subversion, invirt-base +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, git-core, invirt-base Standards-Version: 3.7.2 Package: invirt-web diff --git a/debian/invirt-web.init b/debian/invirt-web.init index ad4c37c..f2031a0 100755 --- a/debian/invirt-web.init +++ b/debian/invirt-web.init @@ -11,7 +11,7 @@ PACKAGE=invirt-web PARENTPACKAGE=apache2 -GEN_FILES=(/etc/apache2/sites-available/{default,ssl,svn} /etc/invirt-iptables/rules.d/50-invirt-web) +GEN_FILES=(/etc/apache2/sites-available/{default,ssl} /etc/invirt-iptables/rules.d/50-invirt-web) . /lib/init/config-init.sh config_init "$1" diff --git a/debian/invirt-web.postinst b/debian/invirt-web.postinst index 14f8469..3703667 100755 --- a/debian/invirt-web.postinst +++ b/debian/invirt-web.postinst @@ -20,7 +20,7 @@ set -e case "$1" in configure) - cd /var/www/invirt-web + cd /usr/share/invirt-web/package/code make all a2enmod rewrite diff --git a/debian/invirt-web.preinst b/debian/invirt-web.preinst index 3245702..aaaeb0e 100644 --- a/debian/invirt-web.preinst +++ b/debian/invirt-web.preinst @@ -19,6 +19,10 @@ case "$1" in if ! getent group invirt > /dev/null; then addgroup --system invirt fi + + if dpkg --compare-versions "$2" lt 0.1.6~; then + mv /var/www/invirt-web /var/www/invirt-web.bak || : + fi ;; abort-upgrade) diff --git a/debian/rules b/debian/rules index b890156..ec1e18d 100755 --- a/debian/rules +++ b/debian/rules @@ -10,4 +10,7 @@ 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 + git clone $$(invirt-getconf git.uri)/invirt/packages/invirt-web $(DEB_DESTDIR)/usr/share/invirt-web/package + mkdir -p $(DEB_DESTDIR)/var/www/ + ln -s /usr/share/invirt-web/package/code $(DEB_DESTDIR)/var/www/invirt-web + rm -rf $(DEB_DESTDIR)/var/www/invirt-web-repo diff --git a/files/etc/apache2/sites-available/svn.mako b/files/etc/apache2/sites-available/svn.mako deleted file mode 100644 index 03f6df3..0000000 --- a/files/etc/apache2/sites-available/svn.mako +++ /dev/null @@ -1,40 +0,0 @@ -<% -from invirt.config import structs as cfg -hostname = cfg.web.hostname -errmail = cfg.web.errormail -svnpath = cfg.svn.repopath -%> -Listen 1111 - - ServerAdmin ${errmail} - ServerName ${hostname}:1111 - - - Options FollowSymLinks - AllowOverride None - - - DAV svn - SVNPath ${svnpath} - AuthType Basic - AuthName "xvm.mit.edu subversion repository" - AuthUserFile /etc/apache2/dav_svn.passwd - - Require valid-user - - - - ErrorLog /var/log/apache2/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/svn_access.log combined - ServerSignature On - - SSLEngine on - - SSLCertificateFile ssl/server.crt - SSLCertificateKeyFile ssl/server.key - -- 1.7.9.5