summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien Thebo <adrien.thebo@gmail.com>2011-05-24 08:43:13 -0700
committerAdrien Thebo <adrien.thebo@gmail.com>2011-05-24 08:43:13 -0700
commit26dc2c63d1f07b04cd4e639f40cc651aacb2ce54 (patch)
treedd7e01a9a947496a6713e15c75d0596034b92ede
parentc9e633c9483f2d0f1a69d380897354b11dbc4a35 (diff)
Miscellaneous fixes.
-rw-r--r--files/gitweb.conf2
-rw-r--r--manifests/init.pp4
-rw-r--r--manifests/settings.pp4
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 (<project>.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"
) {
}