Page MenuHomeSoftware Heritage
Files F9697825

No OneTemporary
Actions

View Options

diff --git a/manifests/client.pp b/manifests/client.pp
index 855049f..8cd21e2 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,3 +1,6 @@
class ssh::client {
- include ssh::params, ssh::client::install, ssh::client::config, ssh::knownhosts
+ include ssh::params
+ include ssh::client::install
+ include ssh::client::config
+ include ssh::knownhosts
}
diff --git a/manifests/hostkeys.pp b/manifests/hostkeys.pp
index 2a507aa..e31a761 100644
--- a/manifests/hostkeys.pp
+++ b/manifests/hostkeys.pp
@@ -1,12 +1,12 @@
class ssh::hostkeys {
- @@sshkey { "${fqdn}_dsa":
- host_aliases => [ "$fqdn", "$hostname", "$ipaddress" ],
+ @@sshkey { "${::fqdn}_dsa":
+ host_aliases => [ $::fqdn, $::hostname, $::ipaddress ],
type => dsa,
- key => $sshdsakey,
+ key => $::sshdsakey,
}
- @@sshkey { "${fqdn}_rsa":
- host_aliases => [ "$fqdn", "$hostname", "$ipaddress" ],
+ @@sshkey { "${::fqdn}_rsa":
+ host_aliases => [ $::fqdn, $::hostname, $::ipaddress ],
type => rsa,
- key => $sshrsakey,
+ key => $::sshrsakey,
}
}
diff --git a/manifests/init.pp b/manifests/init.pp
index 919dbd2..e89da5e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,3 +1,4 @@
class ssh {
- include ssh::server, ssh::client
+ include ssh::server
+ include ssh::client
}
diff --git a/manifests/params.pp b/manifests/params.pp
index 6132cee..b0703b6 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,23 +1,23 @@
class ssh::params {
- case $operatingsystem {
+ case $::operatingsystem {
/(Ubuntu|Debian)/: {
$server_package_name = 'openssh-server'
$client_package_name = 'openssh-client'
$sshd_config = '/etc/ssh/sshd_config'
$ssh_config = '/etc/ssh/ssh_config'
$ssh_known_hosts = '/etc/ssh/ssh_known_hosts'
$service_name = 'ssh'
}
/(CentOS|Fedora|RedHat)/: {
$server_package_name = 'openssh-server'
$client_package_name = 'openssh-clients'
$sshd_config = '/etc/ssh/sshd_config'
$ssh_config = '/etc/ssh/ssh_config'
$ssh_known_hosts = '/etc/ssh/ssh_known_hosts'
$service_name = 'sshd'
}
default: {
- fail("Unsupported platform: $operatingsystem")
+ fail("Unsupported platform: ${::operatingsystem}")
}
}
}
diff --git a/manifests/server.pp b/manifests/server.pp
index 54d29f0..f09a839 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -1,3 +1,8 @@
class ssh::server {
- include ssh::params, ssh::server::install, ssh::server::config, ssh::server::service, ssh::hostkeys, ssh::knownhosts
+ include ssh::params
+ include ssh::server::install
+ include ssh::server::config
+ include ssh::server::service
+ include ssh::hostkeys
+ include ssh::knownhosts
}
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index 176dd32..88ea0b9 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -1,12 +1,12 @@
class ssh::server::config {
file { $ssh::params::sshd_config:
ensure => present,
- owner => "root",
- group => "root",
+ owner => 'root',
+ group => 'root',
mode => 0600,
replace => false,
source => "puppet:///modules/${module_name}/sshd_config",
- require => Class["ssh::server::install"],
- notify => Class["ssh::server::service"],
+ require => Class['ssh::server::install'],
+ notify => Class['ssh::server::service'],
}
}
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index 14612ac..ed36802 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -1,9 +1,9 @@
class ssh::server::service {
service { $ssh::params::service_name:
ensure => running,
hasstatus => true,
hasrestart => true,
enable => true,
- require => Class["ssh::server::config"],
+ require => Class['ssh::server::config'],
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Aug 19, 1:00 AM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3326197

Event Timeline

About · Developer information · Legal