summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-06-27 14:57:19 -0400
committerMicah Anderson <micah@riseup.net>2012-06-27 14:57:19 -0400
commit0662d805536bde7cb17ef5465ef934122bf14978 (patch)
tree487bc3613da4a70aec836d138daa5465aef48159
parent52adf071c4bcf39418defa6e17f6a78d06f485df (diff)
switch to underscores for 2.7
-rw-r--r--manifests/daemon/base.pp12
-rw-r--r--manifests/daemon/vhosts.pp6
-rw-r--r--manifests/web.pp4
3 files changed, 11 insertions, 11 deletions
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp
index 1ae1692..6a03d4f 100644
--- a/manifests/daemon/base.pp
+++ b/manifests/daemon/base.pp
@@ -1,9 +1,9 @@
class git::daemon::base inherits git::base {
file { 'git-daemon_initscript':
- source => [ "puppet://$server/modules/site-git/init.d/${fqdn}/git-daemon",
- "puppet://$server/modules/site-git/init.d/${operatingsystem}/git-daemon",
- "puppet://$server/modules/site-git/init.d/git-daemon",
+ source => [ "puppet://$server/modules/site_git/init.d/${fqdn}/git-daemon",
+ "puppet://$server/modules/site_git/init.d/${operatingsystem}/git-daemon",
+ "puppet://$server/modules/site_git/init.d/git-daemon",
"puppet://$server/modules/git/init.d/${operatingsystem}/git-daemon",
"puppet://$server/modules/git/init.d/git-daemon" ],
require => Package['git'],
@@ -12,9 +12,9 @@ class git::daemon::base inherits git::base {
}
file { 'git-daemon_config':
- source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon",
- "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon",
- "puppet://$server/modules/site-git/config/git-daemon",
+ source => [ "puppet://$server/modules/site_git/config/${fqdn}/git-daemon",
+ "puppet://$server/modules/site_git/config/${operatingsystem}/git-daemon",
+ "puppet://$server/modules/site_git/config/git-daemon",
"puppet://$server/modules/git/config/${operatingsystem}/git-daemon",
"puppet://$server/modules/git/config/git-daemon" ],
require => Package['git'],
diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp
index b568b65..9591330 100644
--- a/manifests/daemon/vhosts.pp
+++ b/manifests/daemon/vhosts.pp
@@ -1,9 +1,9 @@
class git::daemon::vhosts inherits git::daemon {
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",
+ 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" ],
}
diff --git a/manifests/web.pp b/manifests/web.pp
index 8679e29..3cf5139 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -11,8 +11,8 @@ class git::web {
owner => root, group => 0, mode => 0755;
}
file { '/etc/gitweb.conf':
- source => [ "puppet:///modules/site-git/web/${fqdn}/gitweb.conf",
- "puppet:///modules/site-git/web/gitweb.conf",
+ source => [ "puppet:///modules/site_git/web/${fqdn}/gitweb.conf",
+ "puppet:///modules/site_git/web/gitweb.conf",
"puppet:///modules/git/web/gitweb.conf" ],
require => Package['gitweb'],
owner => root, group => 0, mode => 0644;