diff --git a/.gitignore b/.gitignore index 2295c4d..cfae693 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,5 @@ -.git/ -.*.sw[op] -.metadata .yardoc -.yardwarns +Gemfile.lock +FileList .scannerwork -*.iml -/.bundle/ -/.idea/ -/.vagrant/ -/coverage/ -/bin/ -/doc/ -/Gemfile.local -/Gemfile.lock -/junit/ -/log/ -/pkg/ -/spec/fixtures/manifests/ -/spec/fixtures/modules/* -/tmp/ -/vendor/ -/.vendor/ -/convert_report.txt -/update_report.txt -.DS_Store -.project -.envrc -/inventory.yaml -/spec/fixtures/litmus_inventory.yaml -.resource_types -.modules -.task_cache.json -.plan_cache.json -.rerun.json -bolt-debug.log -.vscode -.puppet-lint.rc -.rspec +.vscode \ No newline at end of file diff --git a/.puppet-lint.rc b/.puppet-lint.rc new file mode 100644 index 0000000..269b058 --- /dev/null +++ b/.puppet-lint.rc @@ -0,0 +1,3 @@ +--no-variable_scope-check +--no-top_scope_facts +--no-140chars-check \ No newline at end of file diff --git a/manifests/main/config.pp b/manifests/main/config.pp index 7a281b5..c035b41 100644 --- a/manifests/main/config.pp +++ b/manifests/main/config.pp @@ -5,5 +5,6 @@ ############################################################################## class confdroid_ssh::main::config ( ) inherits confdroid_ssh::params { + require confdroid_selinux include confdroid_ssh::main::service } diff --git a/manifests/params.pp b/manifests/params.pp index 484747d..75caa70 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,6 +12,9 @@ # @param [String] ssh_address_family AddressFamily setting for sshd_config # @param [String] ssh_listen_address ListenAddress setting for sshd_config # @param [String] ssh_root_login PermitRootLogin setting for sshd_config +# @param [String] ssh_strict_modes StrictModes setting for sshd_config +# @param [String] ssh_max_auth_tries MaxAuthTries setting for sshd_config +# @param [String] ssh_max_sessions MaxSessions setting for sshd_config ############################################################################## class confdroid_ssh::params ( @@ -29,6 +32,9 @@ class confdroid_ssh::params ( String $ssh_address_family = 'any', String $ssh_listen_address = '0.0.0.0', String $ssh_root_login = 'prohibit-password', + String $ssh_strict_modes = 'yes', + String $ssh_max_auth_tries = '6', + String $ssh_max_sessions = '10', ) { # default facts diff --git a/templates/sshd_custom_conf.erb b/templates/sshd_custom_conf.erb index 09ff526..496026b 100644 --- a/templates/sshd_custom_conf.erb +++ b/templates/sshd_custom_conf.erb @@ -9,4 +9,7 @@ Port <%= @ssh_fw_port %> AddressFamily <%= @ssh_address_family %> ListenAddress <%= @ssh_listen_address %> -PermitRootLogin <%= @ssh_root_login %> \ No newline at end of file +PermitRootLogin <%= @ssh_root_login %> +StrictModes <%= @ssh_strict_modes %> +MaxAuthTries <%= @ssh_max_auth_tries %> +MaxSessions <%= @ssh_max_sessions %> \ No newline at end of file