diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index ff0a9cd..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,129 +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 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/doc/_index.html b/doc/_index.html index f5b0f9a..b9c274a 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,11 +73,6 @@ -
  • - confdroid_ssh::firewall::iptables - -
    • -
  • confdroid_ssh::main::config diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 5557e96..87e5d2f 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -43,56 +43,49 @@
    • -
  • -
    - confdroid_ssh::firewall::iptables -
    -
    • - - -
  • +
  • confdroid_ssh::main::config
    • -
  • +
  • confdroid_ssh::main::dirs
    • -
  • +
  • confdroid_ssh::main::files
    • -
  • +
  • confdroid_ssh::main::install
    • -
  • +
  • confdroid_ssh::main::service
    • -
  • +
  • confdroid_ssh::params
    • -
  • +
  • confdroid_ssh::selinux::semanage
    diff --git a/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html b/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html index d7b6f9c..501f091 100644 --- a/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html @@ -79,8 +79,6 @@ confdroid_ssh::selinux::semanage
    - confdroid_ssh::firewall::iptables
    - diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp index a43728e..400b418 100644 --- a/manifests/firewall/iptables.pp +++ b/manifests/firewall/iptables.pp @@ -6,7 +6,7 @@ class confdroid_ssh::firewall::iptables ( ) inherits confdroid_ssh::params { - if $ssh_use_firewall { + if $ssh_use_firewall == true { firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}": ensure => 'present', proto => 'tcp', @@ -14,5 +14,14 @@ class confdroid_ssh::firewall::iptables ( dport => $ssh_fw_port, jump => 'accept', } + else { + firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}": + ensure => 'absent', + proto => 'tcp', + source => $ssh_source_range, + dport => $ssh_fw_port, + jump => 'accept', + } + } } }