summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2010-05-11 17:00:20 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2010-05-11 17:00:20 -0400
commit57d8ecf86f49db2c9e367480e380a73cad4b71e6 (patch)
tree473263b26fdb525e7e7c90efbf919b9d3f02dd99 /manifests/init.pp
parent0f0434a582c1f3bd274a79e51ab34a2f4887e659 (diff)
parentfc72cbc8a9d09b2d305df061dfc74cc960610d85 (diff)
Merge commit 'nadir/master'
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 6ad8504..0b21aea 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,7 +24,7 @@ class puppet {
case $operatingsystem {
gentoo: { include puppet::gentoo }
centos: { include puppet::centos }
- debian: { include puppet::debian }
+ debian,ubuntu: { include puppet::debian }
default: { include puppet::linux}
}
}