diff options
author | mh <mh@immerda.ch> | 2009-11-14 14:54:04 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2009-11-14 14:54:04 +0100 |
commit | 7b1f9a68e95cd9dc877145eda08c18e233603bb8 (patch) | |
tree | cc7951da1df9377742ba7acd1b7ee97cdc16e981 | |
parent | 96c222c8e288ef382fe71094699d94fb98d879f3 (diff) |
update to 0.25.x style
-rw-r--r-- | manifests/daemon.pp | 8 | ||||
-rw-r--r-- | manifests/daemon/vhosts.pp | 4 | ||||
-rw-r--r-- | manifests/web.pp | 4 | ||||
-rw-r--r-- | manifests/web/lighttpd.pp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 49047aa..0d22adf 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -6,15 +6,15 @@ class git::daemon { } file{'/etc/init.d/git-daemon': - source => [ "puppet://$server/files/git/init.d/${fqdn}/git-daemon", - "puppet://$server/files/git/init.d/git-daemon", + source => [ "puppet://$server/modules/site-git/init.d/${fqdn}/git-daemon", + "puppet://$server/modules/site-git/init.d/git-daemon", "puppet://$server/modules/git/init.d/git-daemon" ], require => Package['git-daemon'], owner => root, group => 0, mode => 0755; } file{'/etc/sysconfig/git-daemon': - source => [ "puppet://$server/files/git/sysconfig/${fqdn}/git-daemon", - "puppet://$server/files/git/sysconfig/git-daemon", + source => [ "puppet://$server/modules/site-git/sysconfig/${fqdn}/git-daemon", + "puppet://$server/modules/site-git/sysconfig/git-daemon", "puppet://$server/modules/git/sysconfig/git-daemon" ], require => Package['git-daemon'], owner => root, group => 0, mode => 0644; diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp index e893a76..4250a5e 100644 --- a/manifests/daemon/vhosts.pp +++ b/manifests/daemon/vhosts.pp @@ -1,7 +1,7 @@ class git::daemon::vhosts inherits git::daemon { File['/etc/sysconfig/git-daemon']{ - source => [ "puppet://$server/files/git/sysconfig/${fqdn}/git-daemon.vhosts", - "puppet://$server/files/git/sysconfig/git-daemon.vhosts", + source => [ "puppet://$server/modules/site-git/sysconfig/${fqdn}/git-daemon.vhosts", + "puppet://$server/modules/site-git/sysconfig/git-daemon.vhosts", "puppet://$server/modules/git/sysconfig/git-daemon.vhosts" ], } } diff --git a/manifests/web.pp b/manifests/web.pp index 284e9a4..efc247f 100644 --- a/manifests/web.pp +++ b/manifests/web.pp @@ -10,8 +10,8 @@ class git::web { owner => root, group => 0, mode => 0755; } file{'/etc/gitweb.conf': - source => [ "puppet://$server/files/git/web/${fqdn}/gitweb.conf", - "puppet://$server/files/git/web/gitweb.conf", + source => [ "puppet://$server/modules/site-git/web/${fqdn}/gitweb.conf", + "puppet://$server/modules/site-git/web/gitweb.conf", "puppet://$server/modules/git/web/gitweb.conf" ], require => Package['gitweb'], owner => root, group => 0, mode => 0644; diff --git a/manifests/web/lighttpd.pp b/manifests/web/lighttpd.pp index bc627a5..a169dc9 100644 --- a/manifests/web/lighttpd.pp +++ b/manifests/web/lighttpd.pp @@ -17,8 +17,8 @@ class git::web::lighttpd { } class lighttpd::base::git::web inherits lighttpd::base { File['/etc/lighttpd/lighttpd.conf']{ - source => [ "puppet://$server/files/git/web/${fqdn}/lighttpd.conf", - "puppet://$server/files/git/web/lighttpd.conf", + source => [ "puppet://$server/modules/site-git/web/${fqdn}/lighttpd.conf", + "puppet://$server/modules/site-git/web/lighttpd.conf", "puppet://$server/modules/git/web/lighttpd.conf" ], } } |