From 27a622d8691f16b82b0afae69f9f4fedd15fe6a3 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 29 Oct 2010 19:48:20 -0500
Subject: Moved deployment-specific files and configuration to deploy/ until
 someone fixes the debian packages.

---
 deploy/etc/apache2/sites-available/001-piny |  63 +++++++++++++
 deploy/etc/cgitrc                           | 100 +++++++++++++++++++++
 deploy/etc/cron.daily/piny                  |   9 ++
 deploy/srv/templates/page.tmpl              | 132 ++++++++++++++++++++++++++++
 etc/apache2/sites-available/001-piny        |  63 -------------
 etc/cgitrc                                  | 100 ---------------------
 etc/cron.daily/piny                         |   9 --
 srv/templates/page.tmpl                     | 132 ----------------------------
 8 files changed, 304 insertions(+), 304 deletions(-)
 create mode 100644 deploy/etc/apache2/sites-available/001-piny
 create mode 100644 deploy/etc/cgitrc
 create mode 100644 deploy/etc/cron.daily/piny
 create mode 100644 deploy/srv/templates/page.tmpl
 delete mode 100644 etc/apache2/sites-available/001-piny
 delete mode 100644 etc/cgitrc
 delete mode 100644 etc/cron.daily/piny
 delete mode 100644 srv/templates/page.tmpl

diff --git a/deploy/etc/apache2/sites-available/001-piny b/deploy/etc/apache2/sites-available/001-piny
new file mode 100644
index 0000000..6e5c3fd
--- /dev/null
+++ b/deploy/etc/apache2/sites-available/001-piny
@@ -0,0 +1,63 @@
+<VirtualHost *:80>
+	ServerName piny.be
+
+	DocumentRoot /srv/www/piny.be
+
+	<Directory />
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+	</Directory>
+
+	RedirectMatch 301 ^/$ http://piny.be/piny-web/	
+</VirtualHost>
+
+<VirtualHost *:80>
+	ServerName www.piny.be
+	RedirectMatch 301 (.*) http://piny.be$1
+</VirtualHost>
+
+<VirtualHost *:443>
+	ServerName piny.be
+	DocumentRoot /srv/www/piny.be
+
+	<Directory />
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+	</Directory>
+
+	RedirectMatch 301 ^/$ http://piny.be/piny-web/	
+
+	SSLEngine On
+	SSLCertificateFile /etc/ssl/private/secure.piny.be.pem
+	SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem
+</VirtualHost>
+
+<VirtualHost *:80>
+	ServerName secure.piny.be
+	RedirectMatch 301 (.*) https://secure.piny.be$1
+</VirtualHost>
+
+<VirtualHost *:443>
+	ServerName secure.piny.be
+	DocumentRoot /srv/www/secure.piny.be
+
+	<Directory "/srv/www/secure.piny.be">
+		SSLRequireSSL
+		SetHandler cgi-script
+		AllowOverride None
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+	</Directory>
+
+        ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi
+
+	Include /etc/apache2/piny-enabled
+
+	SSLEngine On
+	SSLCertificateFile /etc/ssl/private/secure.piny.be.pem
+	SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem
+</VirtualHost>
+
+<VirtualHost *:80>
+	ServerName piny.svcs.cs.pdx.edu
+	RedirectMatch 301 (.*) http://piny.be$1
+</VirtualHost>
diff --git a/deploy/etc/cgitrc b/deploy/etc/cgitrc
new file mode 100644
index 0000000..db2a9c4
--- /dev/null
+++ b/deploy/etc/cgitrc
@@ -0,0 +1,100 @@
+# Enable caching of up to 1000 output entriess
+cache-size=1000
+
+
+# Specify some default clone prefixes
+clone-prefix=git://piny.be git+ssh://piny.be/srv/git
+
+# Specify the css url
+css=http://piny.be/piny-shared/cgit/cgit.css
+
+
+# Show extra links for each repository on the index page
+enable-index-links=1
+
+
+# Show number of affected files per commit on the log pages
+enable-log-filecount=1
+
+
+# Show number of added/removed lines per commit on the log pages
+enable-log-linecount=1
+
+
+# Add a cgit favicon
+#favicon=/cgit/favicon.ico
+
+
+# Use a custom logo
+logo=http://piny.be/piny-shared/cgit/cgit.png
+
+
+# Set the title and heading of the repository index page
+root-title=Piny git repositories
+
+
+# Set a subheading for the repository index page
+root-desc=For all your informational needs.
+
+
+# Include some more info about foobar.com on the index page
+#root-readme=/var/www/htdocs/about.html
+
+
+# Allow download of tar.gz, tar.bz and zip-files
+snapshots=tar.gz zip
+
+
+##
+## List of repositories.
+## PS: Any repositories listed when repo.group is unset will not be
+##     displayed under a group heading
+## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
+##      and included like this:
+include=/etc/cgitrepos
+##
+
+
+#repo.url=piny-web
+#repo.path=/srv/git/piny-web.git
+#repo.desc=piny-web
+#repo.owner=jrayhawk+piny.be@omgwallhack.org
+#repo.readme=info/web/about.html
+
+
+#repo.url=piny-shared
+#repo.path=/srv/git/piny-shared.git
+#repo.desc=piny-shared
+#repo.owner=jrayhawk+piny.be@omgwallhack.org
+#repo.readme=info/web/about.html
+
+
+# The next repositories will be displayed under the 'extras' heading
+
+#repo.url=baz
+#repo.path=/pub/git/baz.git
+#repo.desc=a set of extensions for bar users
+
+#repo.url=wiz
+#repo.path=/pub/git/wiz.git
+#repo.desc=the wizard of foo
+
+
+# Add some mirrored repositories
+#repo.group=mirrors
+
+
+#repo.url=git
+#repo.path=/pub/git/git.git
+#repo.desc=the dscm
+
+
+#repo.url=linux
+#repo.path=/pub/git/linux.git
+#repo.desc=the kernel
+
+# Disable adhoc downloads of this repo
+repo.snapshots=0
+
+# Disable line-counts for this repo
+repo.enable-log-linecount=0
diff --git a/deploy/etc/cron.daily/piny b/deploy/etc/cron.daily/piny
new file mode 100644
index 0000000..b42a806
--- /dev/null
+++ b/deploy/etc/cron.daily/piny
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export GIT_DIR
+
+for GIT_DIR in $(find /srv/git/ -maxdepth 1 -mindepth 1 -type d -name '*.git'); do
+#  echo $GIT_DIR
+  git gc --aggressive --auto --quiet
+  git update-server-info
+done
diff --git a/deploy/srv/templates/page.tmpl b/deploy/srv/templates/page.tmpl
new file mode 100644
index 0000000..1a76648
--- /dev/null
+++ b/deploy/srv/templates/page.tmpl
@@ -0,0 +1,132 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title><TMPL_VAR TITLE></title>
+<TMPL_IF NAME="FAVICON">
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
+</TMPL_IF>
+<link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> <!-- Optional per-repo custom CSS. -->
+<TMPL_IF NAME="EDITURL">
+<link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
+</TMPL_IF>
+<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
+<TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF>
+<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
+</head>
+<body>
+
+<div class="pageheader">
+<div class="header">
+<span>
+<span class="parentlinks">
+<TMPL_LOOP NAME="PARENTLINKS">
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/ 
+</TMPL_LOOP>
+</span>
+<span class="title">
+<TMPL_VAR TITLE>
+</span>
+</span><!--.header-->
+<TMPL_IF NAME="SEARCHFORM">
+<TMPL_VAR SEARCHFORM>
+</TMPL_IF>
+</div>
+
+<TMPL_IF NAME="HAVE_ACTIONS">
+<div class="actions">
+<ul>
+<TMPL_IF NAME="EDITURL">
+<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
+</TMPL_IF>
+<TMPL_IF NAME="HISTORYURL">
+<li><a href="<TMPL_VAR HISTORYURL>">Page History</a></li>
+</TMPL_IF>
+<TMPL_IF NAME="COMMENTSLINK">
+<li><TMPL_VAR COMMENTSLINK><br /></li>
+<TMPL_ELSE>
+<TMPL_IF NAME="DISCUSSIONLINK">
+<li><TMPL_VAR DISCUSSIONLINK><br /></li>
+</TMPL_IF>
+</TMPL_IF>
+<li><a href="https://secure.piny.be/cgit/<TMPL_VAR WIKINAME>/">Repo Info</a></li>
+</ul>
+</div>
+</TMPL_IF>
+</div> <!-- .pageheader -->
+
+<TMPL_IF SIDEBAR>
+<div id="sidebar">
+<TMPL_VAR SIDEBAR>
+</div>
+</TMPL_IF>
+
+<div id="content">
+<TMPL_VAR CONTENT>
+</div>
+
+<TMPL_IF COMMENTS>
+<div id="comments">
+<TMPL_VAR COMMENTS>
+<TMPL_IF ADDCOMMENTURL>
+<div class="addcomment">
+<a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
+</div>
+<TMPL_ELSE>
+<div class="addcomment">Comments on this page are closed.</div>
+</TMPL_IF>
+</div>
+</TMPL_IF>
+
+<div id="footer" class="pagefooter">
+<div id="pageinfo">
+
+<TMPL_IF NAME="TAGS">
+<div class="tags">
+Tags:
+<TMPL_LOOP NAME="TAGS">
+<TMPL_VAR LINK>
+</TMPL_LOOP>
+</div>
+</TMPL_IF>
+
+<TMPL_IF NAME="BACKLINKS">
+<div id="backlinks">
+Links:
+<TMPL_LOOP NAME="BACKLINKS">
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
+</TMPL_LOOP>
+<TMPL_IF NAME="MORE_BACKLINKS">
+<span class="popup">...
+<span class="balloon">
+<TMPL_LOOP NAME="MORE_BACKLINKS">
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
+</TMPL_LOOP>
+</span>
+</span>
+</TMPL_IF>
+</div><!-- #backlinks -->
+</TMPL_IF>
+
+<TMPL_IF COPYRIGHT>
+<div class="pagecopyright">
+<a name="pagecopyright"></a>
+<TMPL_VAR COPYRIGHT>
+</div>
+</TMPL_IF>
+
+<TMPL_IF LICENSE>
+<div class="pagelicense">
+<a name="pagelicense"></a>
+License: <TMPL_VAR LICENSE>
+</div>
+</TMPL_IF>
+
+</div><!-- #pageinfo -->
+<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
+</div><!-- .pagefooter #footer -->
+
+</body>
+</html>
diff --git a/etc/apache2/sites-available/001-piny b/etc/apache2/sites-available/001-piny
deleted file mode 100644
index 6e5c3fd..0000000
--- a/etc/apache2/sites-available/001-piny
+++ /dev/null
@@ -1,63 +0,0 @@
-<VirtualHost *:80>
-	ServerName piny.be
-
-	DocumentRoot /srv/www/piny.be
-
-	<Directory />
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride None
-	</Directory>
-
-	RedirectMatch 301 ^/$ http://piny.be/piny-web/	
-</VirtualHost>
-
-<VirtualHost *:80>
-	ServerName www.piny.be
-	RedirectMatch 301 (.*) http://piny.be$1
-</VirtualHost>
-
-<VirtualHost *:443>
-	ServerName piny.be
-	DocumentRoot /srv/www/piny.be
-
-	<Directory />
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride None
-	</Directory>
-
-	RedirectMatch 301 ^/$ http://piny.be/piny-web/	
-
-	SSLEngine On
-	SSLCertificateFile /etc/ssl/private/secure.piny.be.pem
-	SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem
-</VirtualHost>
-
-<VirtualHost *:80>
-	ServerName secure.piny.be
-	RedirectMatch 301 (.*) https://secure.piny.be$1
-</VirtualHost>
-
-<VirtualHost *:443>
-	ServerName secure.piny.be
-	DocumentRoot /srv/www/secure.piny.be
-
-	<Directory "/srv/www/secure.piny.be">
-		SSLRequireSSL
-		SetHandler cgi-script
-		AllowOverride None
-		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-	</Directory>
-
-        ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi
-
-	Include /etc/apache2/piny-enabled
-
-	SSLEngine On
-	SSLCertificateFile /etc/ssl/private/secure.piny.be.pem
-	SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem
-</VirtualHost>
-
-<VirtualHost *:80>
-	ServerName piny.svcs.cs.pdx.edu
-	RedirectMatch 301 (.*) http://piny.be$1
-</VirtualHost>
diff --git a/etc/cgitrc b/etc/cgitrc
deleted file mode 100644
index db2a9c4..0000000
--- a/etc/cgitrc
+++ /dev/null
@@ -1,100 +0,0 @@
-# Enable caching of up to 1000 output entriess
-cache-size=1000
-
-
-# Specify some default clone prefixes
-clone-prefix=git://piny.be git+ssh://piny.be/srv/git
-
-# Specify the css url
-css=http://piny.be/piny-shared/cgit/cgit.css
-
-
-# Show extra links for each repository on the index page
-enable-index-links=1
-
-
-# Show number of affected files per commit on the log pages
-enable-log-filecount=1
-
-
-# Show number of added/removed lines per commit on the log pages
-enable-log-linecount=1
-
-
-# Add a cgit favicon
-#favicon=/cgit/favicon.ico
-
-
-# Use a custom logo
-logo=http://piny.be/piny-shared/cgit/cgit.png
-
-
-# Set the title and heading of the repository index page
-root-title=Piny git repositories
-
-
-# Set a subheading for the repository index page
-root-desc=For all your informational needs.
-
-
-# Include some more info about foobar.com on the index page
-#root-readme=/var/www/htdocs/about.html
-
-
-# Allow download of tar.gz, tar.bz and zip-files
-snapshots=tar.gz zip
-
-
-##
-## List of repositories.
-## PS: Any repositories listed when repo.group is unset will not be
-##     displayed under a group heading
-## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
-##      and included like this:
-include=/etc/cgitrepos
-##
-
-
-#repo.url=piny-web
-#repo.path=/srv/git/piny-web.git
-#repo.desc=piny-web
-#repo.owner=jrayhawk+piny.be@omgwallhack.org
-#repo.readme=info/web/about.html
-
-
-#repo.url=piny-shared
-#repo.path=/srv/git/piny-shared.git
-#repo.desc=piny-shared
-#repo.owner=jrayhawk+piny.be@omgwallhack.org
-#repo.readme=info/web/about.html
-
-
-# The next repositories will be displayed under the 'extras' heading
-
-#repo.url=baz
-#repo.path=/pub/git/baz.git
-#repo.desc=a set of extensions for bar users
-
-#repo.url=wiz
-#repo.path=/pub/git/wiz.git
-#repo.desc=the wizard of foo
-
-
-# Add some mirrored repositories
-#repo.group=mirrors
-
-
-#repo.url=git
-#repo.path=/pub/git/git.git
-#repo.desc=the dscm
-
-
-#repo.url=linux
-#repo.path=/pub/git/linux.git
-#repo.desc=the kernel
-
-# Disable adhoc downloads of this repo
-repo.snapshots=0
-
-# Disable line-counts for this repo
-repo.enable-log-linecount=0
diff --git a/etc/cron.daily/piny b/etc/cron.daily/piny
deleted file mode 100644
index b42a806..0000000
--- a/etc/cron.daily/piny
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export GIT_DIR
-
-for GIT_DIR in $(find /srv/git/ -maxdepth 1 -mindepth 1 -type d -name '*.git'); do
-#  echo $GIT_DIR
-  git gc --aggressive --auto --quiet
-  git update-server-info
-done
diff --git a/srv/templates/page.tmpl b/srv/templates/page.tmpl
deleted file mode 100644
index 1a76648..0000000
--- a/srv/templates/page.tmpl
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><TMPL_VAR TITLE></title>
-<TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
-</TMPL_IF>
-<link rel="stylesheet" href="style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> <!-- Optional per-repo custom CSS. -->
-<TMPL_IF NAME="EDITURL">
-<link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
-</TMPL_IF>
-<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
-<TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF>
-<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
-</head>
-<body>
-
-<div class="pageheader">
-<div class="header">
-<span>
-<span class="parentlinks">
-<TMPL_LOOP NAME="PARENTLINKS">
-<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/ 
-</TMPL_LOOP>
-</span>
-<span class="title">
-<TMPL_VAR TITLE>
-</span>
-</span><!--.header-->
-<TMPL_IF NAME="SEARCHFORM">
-<TMPL_VAR SEARCHFORM>
-</TMPL_IF>
-</div>
-
-<TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
-<ul>
-<TMPL_IF NAME="EDITURL">
-<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
-</TMPL_IF>
-<TMPL_IF NAME="HISTORYURL">
-<li><a href="<TMPL_VAR HISTORYURL>">Page History</a></li>
-</TMPL_IF>
-<TMPL_IF NAME="COMMENTSLINK">
-<li><TMPL_VAR COMMENTSLINK><br /></li>
-<TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
-<li><TMPL_VAR DISCUSSIONLINK><br /></li>
-</TMPL_IF>
-</TMPL_IF>
-<li><a href="https://secure.piny.be/cgit/<TMPL_VAR WIKINAME>/">Repo Info</a></li>
-</ul>
-</div>
-</TMPL_IF>
-</div> <!-- .pageheader -->
-
-<TMPL_IF SIDEBAR>
-<div id="sidebar">
-<TMPL_VAR SIDEBAR>
-</div>
-</TMPL_IF>
-
-<div id="content">
-<TMPL_VAR CONTENT>
-</div>
-
-<TMPL_IF COMMENTS>
-<div id="comments">
-<TMPL_VAR COMMENTS>
-<TMPL_IF ADDCOMMENTURL>
-<div class="addcomment">
-<a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
-</div>
-<TMPL_ELSE>
-<div class="addcomment">Comments on this page are closed.</div>
-</TMPL_IF>
-</div>
-</TMPL_IF>
-
-<div id="footer" class="pagefooter">
-<div id="pageinfo">
-
-<TMPL_IF NAME="TAGS">
-<div class="tags">
-Tags:
-<TMPL_LOOP NAME="TAGS">
-<TMPL_VAR LINK>
-</TMPL_LOOP>
-</div>
-</TMPL_IF>
-
-<TMPL_IF NAME="BACKLINKS">
-<div id="backlinks">
-Links:
-<TMPL_LOOP NAME="BACKLINKS">
-<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
-</TMPL_LOOP>
-<TMPL_IF NAME="MORE_BACKLINKS">
-<span class="popup">...
-<span class="balloon">
-<TMPL_LOOP NAME="MORE_BACKLINKS">
-<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
-</TMPL_LOOP>
-</span>
-</span>
-</TMPL_IF>
-</div><!-- #backlinks -->
-</TMPL_IF>
-
-<TMPL_IF COPYRIGHT>
-<div class="pagecopyright">
-<a name="pagecopyright"></a>
-<TMPL_VAR COPYRIGHT>
-</div>
-</TMPL_IF>
-
-<TMPL_IF LICENSE>
-<div class="pagelicense">
-<a name="pagelicense"></a>
-License: <TMPL_VAR LICENSE>
-</div>
-</TMPL_IF>
-
-</div><!-- #pageinfo -->
-<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
-</div><!-- .pagefooter #footer -->
-
-</body>
-</html>
-- 
cgit v1.2.3