Merge branch 'jenkins-build-27' into 'master'

Auto-merge for build 27

See merge request puppet/confdroid_ssh!27

templates/sshd_custom_conf.erb

@@ -5,34 +5,34 @@
 ##### be made in the Puppet manifest parameters.                              #
 ###############################################################################
 
-#Port <%= @ssh_fw_port %>
+Port <%= @ssh_fw_port %>
-#AddressFamily <%= @ssh_address_family %>
+AddressFamily <%= @ssh_address_family %>
-#ListenAddress <%= @ssh_listen_address %> 
+ListenAddress <%= @ssh_listen_address %> 
 <% if @ssh_use_specific_hostkey -%>
-#HostKey /etc/ssh/ssh_host_<%= @ssh_hostkey_type %>_key
+HostKey /etc/ssh/ssh_host_<%= @ssh_hostkey_type %>_key
 <% end -%>
-#RekeyLimit <%= @ssh_rekeylimit %>
+RekeyLimit <%= @ssh_rekeylimit %>
 
-#SyslogFacility <%= @ssh_syslog_facility %>
+SyslogFacility <%= @ssh_syslog_facility %>
-#LogLevel <%= @ssh_log_level %>
+LogLevel <%= @ssh_log_level %>
 
-#LoginGraceTime <%= @ssh_login_grace_time %>
+LoginGraceTime <%= @ssh_login_grace_time %>
-#PermitRootLogin <%= @ssh_root_login %>
+PermitRootLogin <%= @ssh_root_login %>
-#StrictModes <%= @ssh_strict_modes %>
+StrictModes <%= @ssh_strict_modes %>
-#MaxAuthTries <%= @ssh_max_auth_tries %>
+MaxAuthTries <%= @ssh_max_auth_tries %>
-#MaxSessions <%= @ssh_max_sessions %>
+MaxSessions <%= @ssh_max_sessions %>
 
-#PubkeyAuthentication <%= @ssh_pubkey_auth %>
+PubkeyAuthentication <%= @ssh_pubkey_auth %>
-#AuthorizedKeysFile	<%= @ssh_auth_key_files %>
+AuthorizedKeysFile	<%= @ssh_auth_key_files %>
 
-#AuthorizedPrincipalsFile <%= @ssh_authorized_principals_file %>
+AuthorizedPrincipalsFile <%= @ssh_authorized_principals_file %>
-#AuthorizedKeysCommand <%= @ssh_authorized_keys_command %>
+AuthorizedKeysCommand <%= @ssh_authorized_keys_command %>
-#AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
+AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
 
-#PasswordAuthentication <%= @ssh_password_authentication %>
+PasswordAuthentication <%= @ssh_password_authentication %>
-#PermitEmptyPasswords <%= @ssh_permit_empty_passwords %>
+PermitEmptyPasswords <%= @ssh_permit_empty_passwords %>
-#KbdInteractiveAuthentication <%= @ssh_kbd_interactive_auth %>
+KbdInteractiveAuthentication <%= @ssh_kbd_interactive_auth %>
-#UsePAM <%= @ssh_use_pam %>
+UsePAM <%= @ssh_use_pam %>
 
 <% if @ssh_use_kerberos -%>
 KerberosAuthentication <%= @ssh_kerberos_authentication %>
@@ -49,25 +49,25 @@ GSSAPIKeyExchange <%= @ssh_gssapi_key_exchange %>
 GSSAPIEnablek5users <%= @ssh_gssapi_enablek5users %>
 <% end -%>
 
-#AllowAgentForwarding <%= @ssh_allow_agent_forwarding %>
+AllowAgentForwarding <%= @ssh_allow_agent_forwarding %>
-#AllowTcpForwarding <%= @ssh_allow_tcp_forwarding %>
+AllowTcpForwarding <%= @ssh_allow_tcp_forwarding %>
-#GatewayPorts <%= @ssh_gateway_ports %>
+GatewayPorts <%= @ssh_gateway_ports %>
-#X11Forwarding <%= @ssh_x11_forwarding %>
+X11Forwarding <%= @ssh_x11_forwarding %>
-#X11DisplayOffset <%= @ssh_x11_display_offset %>
+X11DisplayOffset <%= @ssh_x11_display_offset %>
-#X11UseLocalhost <%= @ssh_x11_use_localhost %>
+X11UseLocalhost <%= @ssh_x11_use_localhost %>
-#PermitTTY <%= @ssh_permit_tty %>
+PermitTTY <%= @ssh_permit_tty %>
-#PrintMotd <%= @ssh_print_motd %>
+PrintMotd <%= @ssh_print_motd %>
-#PrintLastLog <%= @ssh_print_lastlog %>
+PrintLastLog <%= @ssh_print_lastlog %>
-#TCPKeepAlive <%= @ssh_tcp_keepalive %>
+TCPKeepAlive <%= @ssh_tcp_keepalive %>
-#PermitUserEnvironment <%= @ssh_permit_user_environment %>
+PermitUserEnvironment <%= @ssh_permit_user_environment %>
-#Compression <%= @ssh_compression %>
+Compression <%= @ssh_compression %>
-#ClientAliveInterval <%= @ssh_client_alive_interval %>
+ClientAliveInterval <%= @ssh_client_alive_interval %>
-#ClientAliveCountMax <%= @ssh_client_alive_count_max %>
+ClientAliveCountMax <%= @ssh_client_alive_count_max %>
-#UseDNS <%= @ssh_use_dns %>
+UseDNS <%= @ssh_use_dns %>
-#PidFile <%= @ssh_pid_file %>
+PidFile <%= @ssh_pid_file %>
-#MaxStartups <%= @ssh_max_startups %>
+MaxStartups <%= @ssh_max_startups %>
-#PermitTunnel <%= @ssh_permit_tunnel %>
+PermitTunnel <%= @ssh_permit_tunnel %>
-#ChrootDirectory <%= @ssh_chroot_directory %>
+ChrootDirectory <%= @ssh_chroot_directory %>
-#VersionAddendum <%= @ssh_version_addendum %>
+VersionAddendum <%= @ssh_version_addendum %>
 
-#Banner <%= @ssh_banner %>
+Banner <%= @ssh_banner %>