From 92ab02215470aaf4100e582b0d628734156d7a65 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 3 Nov 2009 17:50:41 -0200
Subject: Adding website definition

---
 templates/macros      | 87 ---------------------------------------------------
 templates/macros.erb  | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++
 templates/website.erb |  1 +
 3 files changed, 88 insertions(+), 87 deletions(-)
 delete mode 100644 templates/macros
 create mode 100644 templates/macros.erb
 create mode 100644 templates/website.erb

(limited to 'templates')

diff --git a/templates/macros b/templates/macros
deleted file mode 100644
index e40bcd5..0000000
--- a/templates/macros
+++ /dev/null
@@ -1,87 +0,0 @@
-<Macro Subversion $repos>
-   # begin svn config
-   <Location /$repos>
-      DAV svn
-      SVNPath /var/svn/$repos
-
-      AuthType Basic
-      AuthName "Subversion $repos"
-      AuthUserFile /var/svn/$repos/conf/htpasswd
-
-      # For any operations other than these, require an authenticated user.
-      <LimitExcept GET PROPFIND OPTIONS REPORT>
-        Require valid-user
-      </LimitExcept>
-   </Location>
-   # end svn config
-</Macro>
-
-<Macro Drupal $version>
-   # begin drupal config
-   <Directory /var/www/sarava/drupal-$version>
-      Options Indexes Includes FollowSymLinks MultiViews
-      AllowOverride All
-   </Directory>
-   # end drupal config
-</Macro>
-
-<Macro Wiki $site>
-   # begin wiki config
-   <Directory /var/users/home/$site/wiki>
-      Options Indexes Includes FollowSymLinks MultiViews
-      AllowOverride All
-   </Directory>
-   # end wiki config
-</Macro>
-
-<Macro Site $name>
-   # begin site config
-   <Directory /var/users/home/$name/site>
-      Options Indexes Includes FollowSymLinks MultiViews
-      AllowOverride All
-   </Directory>
-   # end site config
-</Macro>
-
-<Macro Trac $site>
-   # begin trac config
-   <Location "/trac">
-     SetHandler mod_python
-     PythonInterpreter main_interpreter
-     PythonHandler trac.web.modpython_frontend
-     PythonOption TracEnv /var/users/home/$site/trac
-     PythonOption TracUriRoot /trac
-
-     # This prevents strange behavior when using trac
-     # in the same virtual host with software that
-     # has rewrite rules in .htaccess, such as drupal
-     RewriteEngine off
-   </Location>
-
-   <Location "/trac/login">
-     AuthType Basic
-     AuthName "Trac $site"
-     AuthUserFile /var/users/home/$site/trac/auth/.htpasswd
-     Require valid-user
-   </Location>
-   # end trac config
-</Macro>
-
-<Macro Moin $site>
-   # begin moin config
-   Alias /moinroot /usr/share/moin/htdocs/
-   # TODO: fastcgi
-   ScriptAlias /moin "/var/users/home/$site/moin/cgi-bin/moin.cgi"
-   # end moin config
-   ScriptAlias /moin "/var/users/home/$site/moin/cgi-bin/moin.cgi"
-   # end moin config
-</Macro>
-
-<Macro Ikiwiki $name>
-   # begin ikiwiki config
-   <Directory /var/users/home/$name/ikiwiki>
-      Options Indexes Includes FollowSymLinks MultiViews ExecCGI
-      AllowOverride All
-   </Directory>
-   # end ikiwiki config
-</Macro>
diff --git a/templates/macros.erb b/templates/macros.erb
new file mode 100644
index 0000000..1a9d05c
--- /dev/null
+++ b/templates/macros.erb
@@ -0,0 +1,87 @@
+<Macro Subversion $repos>
+   # begin svn config
+   <Location /$repos>
+      DAV svn
+      SVNPath /var/svn/$repos
+
+      AuthType Basic
+      AuthName "Subversion $repos"
+      AuthUserFile /var/svn/$repos/conf/htpasswd
+
+      # For any operations other than these, require an authenticated user.
+      <LimitExcept GET PROPFIND OPTIONS REPORT>
+        Require valid-user
+      </LimitExcept>
+   </Location>
+   # end svn config
+</Macro>
+
+<Macro Drupal $version>
+   # begin drupal config
+   <Directory <%= apache_www_folder %>/drupal-$version>
+      Options Indexes Includes FollowSymLinks MultiViews
+      AllowOverride All
+   </Directory>
+   # end drupal config
+</Macro>
+
+<Macro Wiki $site>
+   # begin wiki config
+   <Directory <%= apache_sites_folder %>/$site/wiki>
+      Options Indexes Includes FollowSymLinks MultiViews
+      AllowOverride All
+   </Directory>
+   # end wiki config
+</Macro>
+
+<Macro Site $name>
+   # begin site config
+   <Directory <%= apache_sites_folder %>/$name/site>
+      Options Indexes Includes FollowSymLinks MultiViews
+      AllowOverride All
+   </Directory>
+   # end site config
+</Macro>
+
+<Macro Trac $site>
+   # begin trac config
+   <Location "/trac">
+     SetHandler mod_python
+     PythonInterpreter main_interpreter
+     PythonHandler trac.web.modpython_frontend
+     PythonOption TracEnv <%= apache_sites_folder %>/$site/trac
+     PythonOption TracUriRoot /trac
+
+     # This prevents strange behavior when using trac
+     # in the same virtual host with software that
+     # has rewrite rules in .htaccess, such as drupal
+     RewriteEngine off
+   </Location>
+
+   <Location "/trac/login">
+     AuthType Basic
+     AuthName "Trac $site"
+     AuthUserFile <%= apache_sites_folder %>/$site/trac/auth/.htpasswd
+     Require valid-user
+   </Location>
+   # end trac config
+</Macro>
+
+<Macro Moin $site>
+   # begin moin config
+   Alias /moinroot /usr/share/moin/htdocs/
+   # TODO: fastcgi
+   ScriptAlias /moin "<%= apache_sites_folder %>/$site/moin/cgi-bin/moin.cgi"
+   # end moin config
+   ScriptAlias /moin "<%= apache_sites_folder %>/$site/moin/cgi-bin/moin.cgi"
+   # end moin config
+</Macro>
+
+<Macro Ikiwiki $name>
+   # begin ikiwiki config
+   <Directory <%= apache_sites_folder %>/$name/ikiwiki>
+      Options Indexes Includes FollowSymLinks MultiViews ExecCGI
+      AllowOverride All
+   </Directory>
+   # end ikiwiki config
+</Macro>
diff --git a/templates/website.erb b/templates/website.erb
new file mode 100644
index 0000000..3398f60
--- /dev/null
+++ b/templates/website.erb
@@ -0,0 +1 @@
+# TODO: virtual host definition
-- 
cgit v1.2.3