Mercurial > repos > other > Puppet

diff modules/ssh/manifests/init.pp @ 21:7411baa55c01 puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issues with newer Puppet trying to find files for abstract instances that aren't ever used Also, fix variable usage issue (which must be in the original PuppetLabs example)
author IBBoard <dev@ibboard.co.uk>
date Sun, 08 Mar 2015 23:56:35 +0000
parents 956e484adc12
children cd79745f0236
line wrap: on
line diff
--- a/modules/ssh/manifests/init.pp	Sun Mar 08 20:48:03 2015 +0000
+++ b/modules/ssh/manifests/init.pp	Sun Mar 08 23:56:35 2015 +0000
@@ -16,7 +16,7 @@
     @package { [
             "openssh-clients",
             "openssh-server",
-            "denyhosts"
+#            "denyhosts"
         ]:
         ensure => installed
     }
@@ -28,15 +28,15 @@
     # to, and not concern ourselves with duplicate type definitions
     #
 
-    @file { "/etc/denyhosts.conf":
-        notify => Service["denyhosts"],
-        require => Package["denyhosts"],
-        source => [
-            "puppet://$server/private/$domain/denyhosts/denyhosts.conf",
-            "puppet://$server/files/denyhosts/denyhosts.conf",
-            "puppet://$server/denyhosts/denyhosts.conf"
-        ]
-    }
+#    @file { "/etc/denyhosts.conf":
+#        notify => Service["denyhosts"],
+#        require => Package["denyhosts"],
+#        source => [
+#            "puppet://$server/private/$domain/denyhosts/denyhosts.conf",
+#            "puppet://$server/files/denyhosts/denyhosts.conf",
+#            "puppet://$server/denyhosts/denyhosts.conf"
+#        ]
+#    }
 
     @file { "/etc/ssh/ssh_config":
         owner => "root",
@@ -47,20 +47,20 @@
             # See rationale for an explanation on this list of sources
             # http://reductivelabs.com/trac/puppet/wiki/PuppetCommonModules/SSH
             #
-            "puppet://$server/private/$domain/ssh/$os/$osver/ssh_config.$hostname",
-            "puppet://$server/private/$domain/ssh/$os/$osver/ssh_config",
-            "puppet://$server/private/$domain/ssh/$os/ssh_config.$hostname",
-            "puppet://$server/private/$domain/ssh/$os/ssh_config",
+           "puppet://$server/private/$domain/ssh/$operatingsystem/$osver/ssh_config.$hostname",
+            "puppet://$server/private/$domain/ssh/$operatingsystem/$osver/ssh_config",
+            "puppet://$server/private/$domain/ssh/$operatingsystem/ssh_config.$hostname",
+            "puppet://$server/private/$domain/ssh/$operatingsystem/ssh_config",
             "puppet://$server/private/$domain/ssh/ssh_config.$hostname",
             "puppet://$server/private/$domain/ssh/ssh_config",
-            "puppet://$server/files/ssh/$os/$osver/ssh_config.$hostname",
-            "puppet://$server/files/ssh/$os/$osver/ssh_config",
-            "puppet://$server/files/ssh/$os/ssh_config.$hostname",
-            "puppet://$server/files/ssh/$os/ssh_config",
+            "puppet://$server/files/ssh/$operatingsystem/$osver/ssh_config.$hostname",
+            "puppet://$server/files/ssh/$operatingsystem/$osver/ssh_config",
+            "puppet://$server/files/ssh/$operatingsystem/ssh_config.$hostname",
+            "puppet://$server/files/ssh/$operatingsystem/ssh_config",
             "puppet://$server/files/ssh/ssh_config.$hostname",
             "puppet://$server/files/ssh/ssh_config",
-            "puppet://$server/ssh/$os/$osver/ssh_config",
-            "puppet://$server/ssh/$os/ssh_config",
+            "puppet://$server/ssh/$operatingsystem/$osver/ssh_config",
+            "puppet://$server/ssh/$operatingsystem/ssh_config",
             "puppet://$server/ssh/ssh_config"
         ],
         sourceselect => first
@@ -76,20 +76,20 @@
             # See rationale for an explanation on this list of sources
             # http://reductivelabs.com/trac/puppet/wiki/PuppetCommonModules/SSH
             #
-            "puppet://$server/private/$domain/ssh/$os/$osver/sshd_config.$hostname",
-            "puppet://$server/private/$domain/ssh/$os/$osver/sshd_config",
-            "puppet://$server/private/$domain/ssh/$os/sshd_config.$hostname",
-            "puppet://$server/private/$domain/ssh/$os/sshd_config",
+            "puppet://$server/private/$domain/ssh/$operatingsystem/$osver/sshd_config.$hostname",
+            "puppet://$server/private/$domain/ssh/$operatingsystem/$osver/sshd_config",
+            "puppet://$server/private/$domain/ssh/$operatingsystem/sshd_config.$hostname",
+            "puppet://$server/private/$domain/ssh/$operatingsystem/sshd_config",
             "puppet://$server/private/$domain/ssh/sshd_config.$hostname",
             "puppet://$server/private/$domain/ssh/sshd_config",
-            "puppet://$server/files/ssh/$os/$osver/sshd_config.$hostname",
-            "puppet://$server/files/ssh/$os/$osver/sshd_config",
-            "puppet://$server/files/ssh/$os/sshd_config.$hostname",
-            "puppet://$server/files/ssh/$os/sshd_config",
+            "puppet://$server/files/ssh/$operatingsystem/$osver/sshd_config.$hostname",
+            "puppet://$server/files/ssh/$operatingsystem/$osver/sshd_config",
+            "puppet://$server/files/ssh/$operatingsystem/sshd_config.$hostname",
+            "puppet://$server/files/ssh/$operatingsystem/sshd_config",
             "puppet://$server/files/ssh/sshd_config.$hostname",
             "puppet://$server/files/ssh/sshd_config",
-            "puppet://$server/ssh/$os/$osver/sshd_config",
-            "puppet://$server/ssh/$os/sshd_config",
+            "puppet://$server/ssh/$operatingsystem/$osver/sshd_config",
+            "puppet://$server/ssh/$operatingsystem/sshd_config",
             "puppet://$server/ssh/sshd_config"
         ],
         sourceselect => first