diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 77dcd42..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,127 +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_ntp \
- -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 rm -r --cached .vscode || echo "No .vscode to remove from git"
- git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
- git push origin HEAD:master
- '''
- }
- }
- }
- stage('Mirror to Gitea') {
- steps {
- sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
- 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_ntp.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/file.README.html b/doc/file.README.html
index fea391d..cd20116 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -105,7 +105,7 @@
This module differentiates between client- and server configuration. If the FQDN of the puppet client matches the value of cy_server_fqdn, it assumes this to be an ntp time server, else it will be a client.
-If you have no local time server(s), leave the default for cy_server_fqdn.
+If you have no local time server(s), leave cy_use_lan_server at false (default), else set it to true. This affects only client configurations.
The value for cy_server_fqdn is a string rather array, assuming either a single time server or a round-robin DNS entry for this, returning several values for the time server (not configured by this module).
diff --git a/doc/index.html b/doc/index.html
index b3eef95..1384bc8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -105,7 +105,7 @@
This module differentiates between client- and server configuration. If the FQDN of the puppet client matches the value of cy_server_fqdn, it assumes this to be an ntp time server, else it will be a client.
-If you have no local time server(s), leave the default for cy_server_fqdn.
+If you have no local time server(s), leave cy_use_lan_server at false (default), else set it to true. This affects only client configurations.
The value for cy_server_fqdn is a string rather array, assuming either a single time server or a round-robin DNS entry for this, returning several values for the time server (not configured by this module).
diff --git a/doc/puppet_classes/confdroid_ntp_3A_3Aparams.html b/doc/puppet_classes/confdroid_ntp_3A_3Aparams.html
index 39fd025..87d7272 100644
--- a/doc/puppet_classes/confdroid_ntp_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_ntp_3A_3Aparams.html
@@ -266,6 +266,24 @@
—
Log information to record. Valid values are ‘measurements’, ‘statistics’, and ‘tracking’.
+
+
+
+
+
+
+ cy_use_lan_server
+
+
+ (Boolean)
+
+
+ (defaults to: false)
+
+
+ —
+
+
Whether to use a local LAN server or external pool.
-21
22
23
24
@@ -314,41 +331,44 @@
51
52
53
-54
+54
+55
+56
- # File 'manifests/params.pp', line 21
+ # File 'manifests/params.pp', line 22
class confdroid_ntp::params (
# installation
- Array $cy_reqpackages = ['chrony'],
- String $cy_pkg_ensure = 'present',
+ Array $cy_reqpackages = ['chrony'],
+ String $cy_pkg_ensure = 'present',
# configuration
- String $cy_server_fqdn = 'ntp.example.local',
- Array $cy_conf_servers = ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'],
- String $cy_min_sources = '3',
- String $cy_client_allow = '192.168.1.0/24',
- String $cy_leapsec_mode = 'slew',
- String $cy_leapsectz = 'right/UTC',
- String $cy_loginfo = 'measurements statistics tracking',
+ Boolean $cy_use_lan_server = false,
+ String $cy_server_fqdn = 'ntp.example.local',
+ Array $cy_conf_servers = ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'],
+ String $cy_min_sources = '3',
+ String $cy_client_allow = '192.168.1.0/24',
+ String $cy_leapsec_mode = 'slew',
+ String $cy_leapsectz = 'right/UTC',
+ String $cy_loginfo = 'measurements statistics tracking',
) {
# facts
- $fqdn = $facts['networking']['fqdn']
- $domain = $facts['networking']['domain']
- $os_name = $facts['os']['name']
- $os_release = $facts['os']['release']['major']
+ $fqdn = $facts['networking']['fqdn']
+ $domain = $facts['networking']['domain']
+ $os_name = $facts['os']['name']
+ $os_release = $facts['os']['release']['major']
# dirs
# files
- $cy_conf_file = '/etc/chrony.conf'
- $cy_conf_erb = 'confdroid_ntp/chrony.conf.erb'
+ $cy_conf_file = '/etc/chrony.conf'
+ $cy_conf_erb = 'confdroid_ntp/chrony.conf.erb'
# service
- $cy_service = 'chronyd'
+ $cy_service = 'chronyd'
# includes must be last
include confdroid_ntp::main::config
|