From 8f57b985bf4057fdde27c7e7325b74da2f22a267 Mon Sep 17 00:00:00 2001
From: root <root@piny.svcs.cs.pdx.edu>
Date: Mon, 7 Sep 2009 00:28:08 -0700
Subject: Moving /cgi-bin/cgit.cgi/ to /cgit/

---
 etc/apache2/sites-available/001-piny | 2 +-
 srv/templates/page.tmpl              | 2 +-
 usr/local/sbin/newrepo               | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/etc/apache2/sites-available/001-piny b/etc/apache2/sites-available/001-piny
index e283977..5e29fe0 100644
--- a/etc/apache2/sites-available/001-piny
+++ b/etc/apache2/sites-available/001-piny
@@ -47,7 +47,7 @@
 		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
 	</Directory>
 
-        ScriptAlias /cgi-bin/cgit.cgi /usr/lib/cgi-bin/cgit.cgi
+        ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi
 
 	Include /etc/apache2/piny-enabled
 
diff --git a/srv/templates/page.tmpl b/srv/templates/page.tmpl
index 7da82cf..6ada162 100644
--- a/srv/templates/page.tmpl
+++ b/srv/templates/page.tmpl
@@ -51,7 +51,7 @@
 <li><TMPL_VAR DISCUSSIONLINK><br /></li>
 </TMPL_IF>
 </TMPL_IF>
-<li><a href="https://cgi.piny.svcs.cs.pdx.edu/cgi-bin/cgit.cgi/<TMPL_VAR WIKINAME>/">Repo Info</a></li>
+<li><a href="https://cgi.piny.svcs.cs.pdx.edu/cgit/<TMPL_VAR WIKINAME>/">Repo Info</a></li>
 </ul>
 </div>
 </TMPL_IF>
diff --git a/usr/local/sbin/newrepo b/usr/local/sbin/newrepo
index 1493a02..7c7539b 100755
--- a/usr/local/sbin/newrepo
+++ b/usr/local/sbin/newrepo
@@ -94,8 +94,8 @@ use IkiWiki::Setup::Standard {
 	destdir => \'/srv/www/piny.svcs.cs.pdx.edu/' . $reponame . '\', # PINY
 	url => \'http://piny.svcs.cs.pdx.edu/' . $reponame . '\', # PINY
 	cgiurl => \'https://cgi.piny.svcs.cs.pdx.edu/repos/' . $reponame . '/ikiwiki.cgi\', # PINY
-	historyurl => \'https://cgi.piny.svcs.cs.pdx.edu/cgi-bin/cgit.cgi/' . $reponame . '/log/[[file]]\', # PINY
-        diffurl => \'https://cgi.piny.svcs.cs.pdx.edu/cgi-bin/cgit.cgi/' . $reponame . '/diff/?id=[[sha1_commit]]\', # PINY
+	historyurl => \'https://cgi.piny.svcs.cs.pdx.edu/cgit/' . $reponame . '/log/[[file]]\', # PINY
+        diffurl => \'https://cgi.piny.svcs.cs.pdx.edu/cgit/' . $reponame . '/diff/?id=[[sha1_commit]]\', # PINY
 
 	templatedir => "/srv/templates",
 	underlaydir => "/etc/ikiwiki/share/underlay",
@@ -224,3 +224,6 @@ system( "/bin/mv $cgitrctempfile /etc/cgitrepos" ); # This is marginally racy, b
 
 # COMPILE
 system( "/usr/bin/sudo -u ikiwiki-$reponame /usr/bin/ikiwiki --setup /etc/ikiwiki/piny/$reponame.setup | grep -v 'successfully generated'" );
+
+print( "Web interface: http://piny.svcs.cs.pdx.edu/$reponame/\n" );
+print( "Repo information: https://cgi.piny.svcs.cs.pdx.edu/cgit/$reponame/\n" );
-- 
cgit v1.2.3