diff --git a/.puppet-lint.rc b/.puppet-lint.rc deleted file mode 100644 index 269b058..0000000 --- a/.puppet-lint.rc +++ /dev/null @@ -1,3 +0,0 @@ ---no-variable_scope-check ---no-top_scope_facts ---no-140chars-check \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 03e1e65..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,130 +0,0 @@ -pipeline { - agent { - label 'puppet' - } - - post { - always { - deleteDir() /* clean up our workspace */ - } - success { - updateGitlabCommitStatus state: 'success' - } - failure { - updateGitlabCommitStatus state: 'failed' - step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true]) - } - } - - options { - gitLabConnection('gitlab.confdroid.com') - } - - stages { - - stage('pull master') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - sh ''' - git config user.name "Jenkins Server" - git config user.email jenkins@confdroid.com - # Ensure we're on the development branch (triggered by push) - git checkout development - # Create jenkins branch from development - git checkout -b jenkins-build-$BUILD_NUMBER - # Optionally merge master into jenkins to ensure compatibility - git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; } - ''' - } - } - } - - stage('puppet parser') { - steps { - sh '''for file in $(find . -iname \'*.pp\'); do - /opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1; - done;''' - } - } - - stage('check templates') { - steps{ - sh '''for file in $(find . -iname \'*.erb\'); - do erb -P -x -T "-" $file | ruby -c || exit 1; - done;''' - } - } - - stage('puppet-lint') { - steps { - sh '''/usr/local/bin/puppet-lint . \\ - --no-variable_scope-check \\ - || { echo "Puppet lint failed"; exit 1; } - ''' - } - } - - stage('SonarScan') { - steps { - withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) { - sh ''' - /opt/sonar-scanner/bin/sonar-scanner \ - -Dsonar.projectKey=confdroid_ssh \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://sonarqube.confdroid.com \ - -Dsonar.token=$SONAR_TOKEN - ''' - } - } - } - - stage('create Puppet documentation') { - steps { - sh '/opt/puppetlabs/bin/puppet strings' - } - } - - stage('update repo') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - sh ''' - git config user.name "Jenkins Server" - git config user.email jenkins@confdroid.com - git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" - git push -o merge_request.create \ - -o merge_request.target=master \ - -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \ - -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \ - -o merge_request.merge_when_pipeline_succeeds=true \ - origin jenkins-build-$BUILD_NUMBER - ''' - } - } - } - stage('Mirror to Gitea') { - steps { - withCredentials([usernamePassword( - credentialsId: 'Jenkins-gitea', - usernameVariable: 'GITEA_USER', - passwordVariable: 'GITEA_TOKEN')]) { - script { - // Checkout from GitLab (already done implicitly) - sh ''' - git checkout master - git pull origin master - git branch -D development - git branch -D jenkins-build-$BUILD_NUMBER - git rm -f Jenkinsfile - git rm -r --cached .vscode || echo "No .vscode to remove from git" - git rm -r --cached .puppet-lint.rc || echo "No .puppet-lint.rc to remove from git" - git commit --amend --no-edit --allow-empty - git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_ssh.git - git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ - push master --mirror - ''' - } - } - } - } - } -} \ No newline at end of file diff --git a/templates/sshd_custom_conf.erb b/templates/sshd_custom_conf.erb index 85f943d..8586781 100644 --- a/templates/sshd_custom_conf.erb +++ b/templates/sshd_custom_conf.erb @@ -5,34 +5,34 @@ ##### be made in the Puppet manifest parameters. # ############################################################################### -Port <%= @ssh_fw_port %> -AddressFamily <%= @ssh_address_family %> -ListenAddress <%= @ssh_listen_address %> +#Port <%= @ssh_fw_port %> +#AddressFamily <%= @ssh_address_family %> +#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 %> -LogLevel <%= @ssh_log_level %> +#SyslogFacility <%= @ssh_syslog_facility %> +#LogLevel <%= @ssh_log_level %> -LoginGraceTime <%= @ssh_login_grace_time %> -PermitRootLogin <%= @ssh_root_login %> -StrictModes <%= @ssh_strict_modes %> -MaxAuthTries <%= @ssh_max_auth_tries %> -MaxSessions <%= @ssh_max_sessions %> +#LoginGraceTime <%= @ssh_login_grace_time %> +#PermitRootLogin <%= @ssh_root_login %> +#StrictModes <%= @ssh_strict_modes %> +#MaxAuthTries <%= @ssh_max_auth_tries %> +#MaxSessions <%= @ssh_max_sessions %> -PubkeyAuthentication <%= @ssh_pubkey_auth %> -AuthorizedKeysFile <%= @ssh_auth_key_files %> +#PubkeyAuthentication <%= @ssh_pubkey_auth %> +#AuthorizedKeysFile <%= @ssh_auth_key_files %> -AuthorizedPrincipalsFile <%= @ssh_authorized_principals_file %> -AuthorizedKeysCommand <%= @ssh_authorized_keys_command %> -AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %> +#AuthorizedPrincipalsFile <%= @ssh_authorized_principals_file %> +#AuthorizedKeysCommand <%= @ssh_authorized_keys_command %> +#AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %> -PasswordAuthentication <%= @ssh_password_authentication %> -PermitEmptyPasswords <%= @ssh_permit_empty_passwords %> -KbdInteractiveAuthentication <%= @ssh_kbd_interactive_auth %> -UsePAM <%= @ssh_use_pam %> +#PasswordAuthentication <%= @ssh_password_authentication %> +#PermitEmptyPasswords <%= @ssh_permit_empty_passwords %> +#KbdInteractiveAuthentication <%= @ssh_kbd_interactive_auth %> +#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 %> -AllowTcpForwarding <%= @ssh_allow_tcp_forwarding %> -GatewayPorts <%= @ssh_gateway_ports %> -X11Forwarding <%= @ssh_x11_forwarding %> -X11DisplayOffset <%= @ssh_x11_display_offset %> -X11UseLocalhost <%= @ssh_x11_use_localhost %> -PermitTTY <%= @ssh_permit_tty %> -PrintMotd <%= @ssh_print_motd %> -PrintLastLog <%= @ssh_print_lastlog %> -TCPKeepAlive <%= @ssh_tcp_keepalive %> -PermitUserEnvironment <%= @ssh_permit_user_environment %> -Compression <%= @ssh_compression %> -ClientAliveInterval <%= @ssh_client_alive_interval %> -ClientAliveCountMax <%= @ssh_client_alive_count_max %> -UseDNS <%= @ssh_use_dns %> -PidFile <%= @ssh_pid_file %> -MaxStartups <%= @ssh_max_startups %> -PermitTunnel <%= @ssh_permit_tunnel %> -ChrootDirectory <%= @ssh_chroot_directory %> -VersionAddendum <%= @ssh_version_addendum %> +#AllowAgentForwarding <%= @ssh_allow_agent_forwarding %> +#AllowTcpForwarding <%= @ssh_allow_tcp_forwarding %> +#GatewayPorts <%= @ssh_gateway_ports %> +#X11Forwarding <%= @ssh_x11_forwarding %> +#X11DisplayOffset <%= @ssh_x11_display_offset %> +#X11UseLocalhost <%= @ssh_x11_use_localhost %> +#PermitTTY <%= @ssh_permit_tty %> +#PrintMotd <%= @ssh_print_motd %> +#PrintLastLog <%= @ssh_print_lastlog %> +#TCPKeepAlive <%= @ssh_tcp_keepalive %> +#PermitUserEnvironment <%= @ssh_permit_user_environment %> +#Compression <%= @ssh_compression %> +#ClientAliveInterval <%= @ssh_client_alive_interval %> +#ClientAliveCountMax <%= @ssh_client_alive_count_max %> +#UseDNS <%= @ssh_use_dns %> +#PidFile <%= @ssh_pid_file %> +#MaxStartups <%= @ssh_max_startups %> +#PermitTunnel <%= @ssh_permit_tunnel %> +#ChrootDirectory <%= @ssh_chroot_directory %> +#VersionAddendum <%= @ssh_version_addendum %> -Banner <%= @ssh_banner %> \ No newline at end of file +#Banner <%= @ssh_banner %> \ No newline at end of file