diff options
| author | Micah Anderson <micah@riseup.net> | 2011-04-01 13:29:43 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-04-01 13:29:43 -0400 |
| commit | f2846099d1e24589600d6a3a346ab92e5c65f843 (patch) | |
| tree | 9bc6b1ba9502c3bd42b64a4834ef91dc7f7fce5a /manifests/daemon/vhosts.pp | |
| parent | 74ccc33ff4f0158e80db4dbc64d4edc490acb26c (diff) | |
| parent | 5c746aa9a4ee5748cbaa6812a508e3dd878b621c (diff) | |
Merge remote-tracking branch 'lavamind/master'
Conflicts:
manifests/daemon.pp
manifests/daemon/disable.pp
manifests/daemon/vhosts.pp
Diffstat (limited to 'manifests/daemon/vhosts.pp')
| -rw-r--r-- | manifests/daemon/vhosts.pp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp index beb33ab..d627df1 100644 --- a/manifests/daemon/vhosts.pp +++ b/manifests/daemon/vhosts.pp @@ -1,15 +1,9 @@ class git::daemon::vhosts inherits git::daemon { - if $git_daemon == 'service' { - File['/etc/sysconfig/git-daemon']{ - source => [ "puppet:///modules/site-git/sysconfig/${fqdn}/git-daemon.vhosts", - "puppet:///modules/site-git/sysconfig/git-daemon.vhosts", - "puppet:///modules/git/sysconfig/git-daemon.vhosts" ], + File['git-daemon_config']{ + source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon.vhosts", + "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon.vhosts", + "puppet://$server/modules/site-git/config/git-daemon.vhosts", + "puppet://$server/modules/git/config/${operatingsystem}/git-daemon.vhosts", + "puppet://$server/modules/git/config/git-daemon.vhosts" ], } - } else { - Xinetd::File['git']{ - source => [ "puppet:///modules/site-git/xinetd.d/${fqdn}/git.vhosts", - "puppet:///modules/site-git/xinetd.d/git.vhosts", - "puppet:///modules/git/xinetd.d/git.vhosts" ], - } - } } |