diff options
| author | Adrien Thebo <adrien.thebo@gmail.com> | 2011-05-31 14:09:31 -0700 |
|---|---|---|
| committer | Adrien Thebo <adrien.thebo@gmail.com> | 2011-05-31 14:09:31 -0700 |
| commit | 18310aa26c9fd5644115ef38722aaf75302ded53 (patch) | |
| tree | de916fa0320eb30fdddf7447cf55c34920bbc98d /manifests | |
| parent | 26dc2c63d1f07b04cd4e639f40cc651aacb2ce54 (diff) | |
Updated apache template, added args, removed ssl.
- SSL was breaking testing, removed it for the time being.
- Converted gitweb.conf to template.
- Added more options to gitweb::settings.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 8 | ||||
| -rw-r--r-- | manifests/settings.pp | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index fbe5610..4f62e1d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,14 +21,16 @@ class gitweb { owner => "root", group => "root", mode => "0644", - source => "puppet:///modules/gitweb/gitweb.conf", + content => template("gitweb/gitweb.conf.erb"), require => Package["gitweb"], } + A2mod <| title == "rewrite" |> + apache::vhost { "$gitweb::settings::site_alias": priority => "10", - port => "443", - ssl => true, + port => "80", + ssl => false, docroot => "/var/www/git", template => "gitweb/apache-gitweb.conf.erb", } diff --git a/manifests/settings.pp b/manifests/settings.pp index 49317db..c108b3b 100644 --- a/manifests/settings.pp +++ b/manifests/settings.pp @@ -1,7 +1,8 @@ # Class: gitweb::settings # # Parameters: -# +# - site_alias: The site alias to make gitweb available +# - projectroot: The location where the git repositories are stored # Actions: # # Requires: @@ -9,6 +10,7 @@ # Sample Usage: # class gitweb::settings ( - $site_alias = "gitweb" + $site_alias = "gitweb", + $projectroot = "/var/cache/git" ) { } |