diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-06-05 19:07:45 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-06-05 19:07:45 -0300 |
| commit | 98cdd18633ba2b1becb6402d23dd08b1dd218771 (patch) | |
| tree | cce9251848561845fb186b70fdacc187aa7a405e | |
| parent | 870179470cfee459c3e9d5aa62ea29af21196a2c (diff) | |
| download | puppet-tunnel-98cdd18633ba2b1becb6402d23dd08b1dd218771.tar.gz puppet-tunnel-98cdd18633ba2b1becb6402d23dd08b1dd218771.tar.bz2 | |
Changes for puppet 4 compatibility
| -rw-r--r-- | manifests/autossh/instance.pp | 6 | ||||
| -rw-r--r-- | manifests/autossh/mail.pp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/manifests/autossh/instance.pp b/manifests/autossh/instance.pp index bdfcaac..8f99576 100644 --- a/manifests/autossh/instance.pp +++ b/manifests/autossh/instance.pp @@ -34,7 +34,7 @@ define tunnel::autossh::instance( if !defined(File["${dir}"]) { @@file { "${dir}": ensure => directory, - mode => 0750, + mode => '0750', owner => $user, group => 0, tag => "${tag}", @@ -44,7 +44,7 @@ define tunnel::autossh::instance( if !defined(File["${ssh_dir}"]) { @@file { "${ssh_dir}": ensure => directory, - mode => 0700, + mode => '0700', owner => $user, group => 0, require => [User[$user], File["${dir}"]], @@ -55,7 +55,7 @@ define tunnel::autossh::instance( if !defined(File["${ssh_dir}/authorized_keys"]) { @@file { "${ssh_dir}/authorized_keys": ensure => present, - mode => 0644, + mode => '0644', owner => 0, group => 0, source => "puppet:///pubkeys/${user}_id_${keytype}.pub", diff --git a/manifests/autossh/mail.pp b/manifests/autossh/mail.pp index 2875025..0149b29 100644 --- a/manifests/autossh/mail.pp +++ b/manifests/autossh/mail.pp @@ -12,7 +12,7 @@ define tunnel::autossh::mail($sshport = '22') { ensure => present, owner => root, group => root, - mode => 0644, + mode => '0644', content => "${::fqdn}\n", notify => Service["nullmailer"], } @@ -21,14 +21,14 @@ define tunnel::autossh::mail($sshport = '22') { ensure => directory, owner => root, group => root, - mode => 0755, + mode => '0755', } file { "/etc/nullmailer/remotes": ensure => present, owner => root, group => root, - mode => 0644, + mode => '0644', content => "localhost smtp --port=2525\n", notify => Service["nullmailer"], require => File["/etc/nullmailer"], @@ -38,7 +38,7 @@ define tunnel::autossh::mail($sshport = '22') { ensure => present, owner => root, group => root, - mode => 0644, + mode => '0644', content => "$root_mail_recipient\n", require => File["/etc/nullmailer"], } |