diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-11-03 17:50:41 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-11-03 17:50:41 -0200 |
| commit | 92ab02215470aaf4100e582b0d628734156d7a65 (patch) | |
| tree | f306bb3161d8519f46cdddd47c8fbe52c1dd5b1a /templates | |
| parent | e62b2bd262f984e02e4ac5f801dbd80d81fc5b5e (diff) | |
| download | puppet-apache-92ab02215470aaf4100e582b0d628734156d7a65.tar.gz puppet-apache-92ab02215470aaf4100e582b0d628734156d7a65.tar.bz2 | |
Adding website definition
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/macros.erb (renamed from templates/macros) | 16 | ||||
| -rw-r--r-- | templates/website.erb | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/templates/macros b/templates/macros.erb index e40bcd5..1a9d05c 100644 --- a/templates/macros +++ b/templates/macros.erb @@ -18,7 +18,7 @@ <Macro Drupal $version> # begin drupal config - <Directory /var/www/sarava/drupal-$version> + <Directory <%= apache_www_folder %>/drupal-$version> Options Indexes Includes FollowSymLinks MultiViews AllowOverride All </Directory> @@ -27,7 +27,7 @@ <Macro Wiki $site> # begin wiki config - <Directory /var/users/home/$site/wiki> + <Directory <%= apache_sites_folder %>/$site/wiki> Options Indexes Includes FollowSymLinks MultiViews AllowOverride All </Directory> @@ -36,7 +36,7 @@ <Macro Site $name> # begin site config - <Directory /var/users/home/$name/site> + <Directory <%= apache_sites_folder %>/$name/site> Options Indexes Includes FollowSymLinks MultiViews AllowOverride All </Directory> @@ -49,7 +49,7 @@ SetHandler mod_python PythonInterpreter main_interpreter PythonHandler trac.web.modpython_frontend - PythonOption TracEnv /var/users/home/$site/trac + PythonOption TracEnv <%= apache_sites_folder %>/$site/trac PythonOption TracUriRoot /trac # This prevents strange behavior when using trac @@ -61,7 +61,7 @@ <Location "/trac/login"> AuthType Basic AuthName "Trac $site" - AuthUserFile /var/users/home/$site/trac/auth/.htpasswd + AuthUserFile <%= apache_sites_folder %>/$site/trac/auth/.htpasswd Require valid-user </Location> # end trac config @@ -71,15 +71,15 @@ # begin moin config Alias /moinroot /usr/share/moin/htdocs/ # TODO: fastcgi - ScriptAlias /moin "/var/users/home/$site/moin/cgi-bin/moin.cgi" + ScriptAlias /moin "<%= apache_sites_folder %>/$site/moin/cgi-bin/moin.cgi" # end moin config - ScriptAlias /moin "/var/users/home/$site/moin/cgi-bin/moin.cgi" + ScriptAlias /moin "<%= apache_sites_folder %>/$site/moin/cgi-bin/moin.cgi" # end moin config </Macro> <Macro Ikiwiki $name> # begin ikiwiki config - <Directory /var/users/home/$name/ikiwiki> + <Directory <%= apache_sites_folder %>/$name/ikiwiki> Options Indexes Includes FollowSymLinks MultiViews ExecCGI AllowOverride All </Directory> 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 |