diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/init.pp | 18 | ||||
-rw-r--r-- | manifests/settings.pp | 1 |
2 files changed, 13 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 4f62e1d..801e3e5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,13 +1,14 @@ # Class: gitweb -# +# Installs gitweb and configures apache to server it. # Parameters: # # Actions: # # Requires: -# - puppetlabs-apache +# - apache +# - gitweb::settings # Sample Usage: -# +# include gitweb class gitweb { include gitweb::settings @@ -27,10 +28,15 @@ class gitweb { A2mod <| title == "rewrite" |> - apache::vhost { "$gitweb::settings::site_alias": + apache::vhost::redirect { "${gitweb::settings::site_alias}": + port => "80", + dest => "https://${gitweb::settings::site_alias}", + } + + apache::vhost { "${gitweb::settings::site_alias}_ssl": priority => "10", - port => "80", - ssl => false, + port => "443", + ssl => true, docroot => "/var/www/git", template => "gitweb/apache-gitweb.conf.erb", } diff --git a/manifests/settings.pp b/manifests/settings.pp index c108b3b..85c58dc 100644 --- a/manifests/settings.pp +++ b/manifests/settings.pp @@ -1,4 +1,5 @@ # Class: gitweb::settings +# Provides default values for gitweb and allows for overriding. # # Parameters: # - site_alias: The site alias to make gitweb available |