diff options
| author | Micah Anderson <micah@riseup.net> | 2011-05-11 10:19:42 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-05-11 10:28:13 -0400 |
| commit | 9495860330ac66899616f10c51059447966d1181 (patch) | |
| tree | e1aeb939a9dda469d4d3000dd50aeab46fa5e732 | |
| parent | 3b9531f22f58ee6472afa7b0a31c8e633a50b05b (diff) | |
fix for #2964: Parameter path failed: File paths must be fully qualified, not 'git-daemon_config' at /etc/puppet/modules/git/manifests/daemon/base.pp:21
I've set default paths for these resources. They match the debian ones, and as a result obsolete the git::daemon::debian resource overrides
| -rw-r--r-- | manifests/daemon/base.pp | 3 | ||||
| -rw-r--r-- | manifests/daemon/debian.pp | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp index 5dd16d6..5632950 100644 --- a/manifests/daemon/base.pp +++ b/manifests/daemon/base.pp @@ -7,6 +7,7 @@ class git::daemon::base { "puppet://$server/modules/git/init.d/${operatingsystem}/git-daemon", "puppet://$server/modules/git/init.d/git-daemon" ], require => Package['git'], + path => "/etc/init.d/git-daemon", owner => root, group => 0, mode => 0755; } @@ -17,6 +18,7 @@ class git::daemon::base { "puppet://$server/modules/git/config/${operatingsystem}/git-daemon", "puppet://$server/modules/git/config/git-daemon" ], require => Package['git'], + path => "/etc/default/git-daemon", owner => root, group => 0, mode => 0644; } @@ -26,5 +28,4 @@ class git::daemon::base { hasstatus => true, require => [ File['git-daemon_initscript'], File['git-daemon_config'] ], } - } diff --git a/manifests/daemon/debian.pp b/manifests/daemon/debian.pp deleted file mode 100644 index 006ffc5..0000000 --- a/manifests/daemon/debian.pp +++ /dev/null @@ -1,11 +0,0 @@ -class git::daemon::debian inherits git::daemon::base { - - File['git-daemon_initscript'] { - path => '/etc/init.d/git-daemon', - } - - File['git-daemon_config'] { - path => '/etc/default/git-daemon', - } - -} |