diff options
author | Michael Scherer <misc@mageia.org> | 2012-03-19 16:56:07 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-03-19 16:56:07 +0000 |
commit | 2331283eac42fa2c586736e1b08238f6b44c3f93 (patch) | |
tree | dcc714802531fd02995b9a1f599c6f53f2fa8d58 /modules/openssh | |
parent | cdddaf8ed5fad128dfe7dcb99dc31e4a84a65f5e (diff) | |
download | puppet-2331283eac42fa2c586736e1b08238f6b44c3f93.tar puppet-2331283eac42fa2c586736e1b08238f6b44c3f93.tar.gz puppet-2331283eac42fa2c586736e1b08238f6b44c3f93.tar.bz2 puppet-2331283eac42fa2c586736e1b08238f6b44c3f93.tar.xz puppet-2331283eac42fa2c586736e1b08238f6b44c3f93.zip |
split server in a separate file, and clean the module
Diffstat (limited to 'modules/openssh')
-rw-r--r-- | modules/openssh/manifests/init.pp | 18 | ||||
-rw-r--r-- | modules/openssh/manifests/server.pp | 16 |
2 files changed, 16 insertions, 18 deletions
diff --git a/modules/openssh/manifests/init.pp b/modules/openssh/manifests/init.pp index f05341b3..32cc4ec9 100644 --- a/modules/openssh/manifests/init.pp +++ b/modules/openssh/manifests/init.pp @@ -1,22 +1,4 @@ class openssh { - class server { - # some trick to manage sftp server, who is arch dependent on mdv - $path_to_sftp = "$lib_dir/ssh/" - - package { "openssh-server": } - - service { sshd: - subscribe => Package["openssh-server"], - } - - - file { "/etc/ssh/sshd_config": - require => Package["openssh-server"], - content => template("openssh/sshd_config"), - notify => Service["sshd"] - } - } - # root account authorized_keys will be symlinked # if you want to add symlink on other accounts, use $symlink_users parameter class ssh_keys_from_ldap($symlink_users = [], diff --git a/modules/openssh/manifests/server.pp b/modules/openssh/manifests/server.pp new file mode 100644 index 00000000..ce60646b --- /dev/null +++ b/modules/openssh/manifests/server.pp @@ -0,0 +1,16 @@ +class openssh::server { + # some trick to manage sftp server, who is arch dependent on mdv + $path_to_sftp = "$::lib_dir/ssh/" + + package { 'openssh-server': } + + service { 'sshd': + subscribe => Package['openssh-server'], + } + + file { '/etc/ssh/sshd_config': + require => Package['openssh-server'], + content => template('openssh/sshd_config'), + notify => Service['sshd'] + } +} |