From 26dc2c63d1f07b04cd4e639f40cc651aacb2ce54 Mon Sep 17 00:00:00 2001 From: Adrien Thebo Date: Tue, 24 May 2011 08:43:13 -0700 Subject: Miscellaneous fixes. --- files/gitweb.conf | 2 +- manifests/init.pp | 4 +++- manifests/settings.pp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/files/gitweb.conf b/files/gitweb.conf index 57572d3..8e2fb51 100644 --- a/files/gitweb.conf +++ b/files/gitweb.conf @@ -1,5 +1,5 @@ # path to git projects (.git) -$projectroot = "/var/www/git"; +$projectroot = "/var/cache/git"; # directory to use for temp files $git_temp = "/tmp"; diff --git a/manifests/init.pp b/manifests/init.pp index d3dcfdf..fbe5610 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -10,6 +10,8 @@ # class gitweb { + include gitweb::settings + package { "gitweb": ensure => present, } @@ -23,7 +25,7 @@ class gitweb { require => Package["gitweb"], } - apache::vhost { "$site_alias": + apache::vhost { "$gitweb::settings::site_alias": priority => "10", port => "443", ssl => true, diff --git a/manifests/settings.pp b/manifests/settings.pp index ba31247..49317db 100644 --- a/manifests/settings.pp +++ b/manifests/settings.pp @@ -8,7 +8,7 @@ # # Sample Usage: # -class gitweb::settings ( - $site_alias = "gitweb", +class gitweb::settings ( + $site_alias = "gitweb" ) { } -- cgit v1.2.3