added development branch
This commit is contained in:
3
Gemfile
3
Gemfile
@@ -11,6 +11,7 @@ gem 'puppet-strings'
|
|||||||
gem 'rake'
|
gem 'rake'
|
||||||
gem 'semantic_puppet'
|
gem 'semantic_puppet'
|
||||||
gem 'rgen'
|
gem 'rgen'
|
||||||
|
gem 'public_suffix', '<= 2.0.5'
|
||||||
|
|
||||||
# rspec must be v2 for ruby 1.8.7
|
# rspec must be v2 for ruby 1.8.7
|
||||||
if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
|
if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
|
||||||
@@ -18,5 +19,5 @@ if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
|
|||||||
gem 'rake', '~> 10.0'
|
gem 'rake', '~> 10.0'
|
||||||
else
|
else
|
||||||
# rubocop requires ruby >= 1.9
|
# rubocop requires ruby >= 1.9
|
||||||
gem 'rubocop'
|
gem 'rubocop', '<= 0.50.0'
|
||||||
end
|
end
|
||||||
|
|||||||
10
Jenkinsfile
vendored
10
Jenkinsfile
vendored
@@ -7,7 +7,7 @@ pipeline {
|
|||||||
|
|
||||||
stage('pulling master before adding files') {
|
stage('pulling master before adding files') {
|
||||||
steps {
|
steps {
|
||||||
sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) {
|
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
|
||||||
sh '''git config user.name "Jenkins Server"
|
sh '''git config user.name "Jenkins Server"
|
||||||
git config user.email jenkins@confdroid.com
|
git config user.email jenkins@confdroid.com
|
||||||
git pull origin master
|
git pull origin master
|
||||||
@@ -24,7 +24,7 @@ pipeline {
|
|||||||
|
|
||||||
stage('puppet-lint tests') {
|
stage('puppet-lint tests') {
|
||||||
steps {
|
steps {
|
||||||
sh '''find . -iname *.pp -exec puppet-lint \\
|
sh '''find . -iname *.pp -exec /var/lib/jenkins/bin/puppet-lint \\
|
||||||
--no-class_inherits_from_params_class-check \\
|
--no-class_inherits_from_params_class-check \\
|
||||||
--no-variable_scope-check \\
|
--no-variable_scope-check \\
|
||||||
--no-80chars-check \\
|
--no-80chars-check \\
|
||||||
@@ -97,7 +97,7 @@ Changelog of Git Changelog.
|
|||||||
|
|
||||||
|
|
||||||
{{#commits}}
|
{{#commits}}
|
||||||
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/{{hash}}">{{hash}}</a> {{authorName}} <i>{{commitTime}}</i>
|
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/{{hash}}">{{hash}}</a> {{authorName}} <i>{{commitTime}}</i>
|
||||||
<p>
|
<p>
|
||||||
<h3>{{{messageTitle}}}</h3>
|
<h3>{{{messageTitle}}}</h3>
|
||||||
|
|
||||||
@@ -130,7 +130,7 @@ Changelog of Git Changelog.
|
|||||||
{{/hasIssue}}
|
{{/hasIssue}}
|
||||||
|
|
||||||
{{#commits}}
|
{{#commits}}
|
||||||
[https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}}
|
[https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}}
|
||||||
|
|
||||||
\'\'\'{{{messageTitle}}}\'\'\'
|
\'\'\'{{{messageTitle}}}\'\'\'
|
||||||
|
|
||||||
@@ -207,7 +207,7 @@ Changelog of Git Changelog.
|
|||||||
|
|
||||||
stage('recommit changes to repo') {
|
stage('recommit changes to repo') {
|
||||||
steps {
|
steps {
|
||||||
sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) {
|
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
|
||||||
sh '''git config user.name "Jenkins Server"
|
sh '''git config user.name "Jenkins Server"
|
||||||
git config user.email jenkins@confdroid.com
|
git config user.email jenkins@confdroid.com
|
||||||
echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"`
|
echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"`
|
||||||
|
|||||||
14
README.md
14
README.md
@@ -1,6 +1,6 @@
|
|||||||
|Repo Name| version | Build Status|
|
|Repo Name| version | Build Status|
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
|`cd_nrpe`| 0.0.1.1 | [](https://jenkins.confdroid.com/job/cd_nrpe/)|
|
|`cd_nrpe`| 0.0.1.1 | [](https://pipelines.confdroid.com/job/cd_nrpe/)|
|
||||||
|
|
||||||
### Synopsis
|
### Synopsis
|
||||||
NRPE allows monitoring tools like NAGIOS or ICINGA to connect to clients for monitoring purposes.
|
NRPE allows monitoring tools like NAGIOS or ICINGA to connect to clients for monitoring purposes.
|
||||||
@@ -12,7 +12,7 @@ NRPE allows monitoring tools like NAGIOS or ICINGA to connect to clients for mon
|
|||||||
|
|
||||||
### Table of Contents
|
### Table of Contents
|
||||||
* [Features](#features)
|
* [Features](#features)
|
||||||
* [Repo Structure](https://gitlab.puppetsoft.com/12WW1160/cd_nrpe/blob/master/REPOSTRUCTURE.md)
|
* [Repo Structure](https://gitlab.confdroid.com/12WW1160/cd_nrpe/blob/master/REPOSTRUCTURE.md)
|
||||||
* [Repo Documention](#repo-documentation)
|
* [Repo Documention](#repo-documentation)
|
||||||
* [Dependencies](#dependencies)
|
* [Dependencies](#dependencies)
|
||||||
* [Deployment](#deployment)
|
* [Deployment](#deployment)
|
||||||
@@ -24,7 +24,7 @@ NRPE allows monitoring tools like NAGIOS or ICINGA to connect to clients for mon
|
|||||||
* [Known Problems](#known-problems)
|
* [Known Problems](#known-problems)
|
||||||
* [Support](#support)
|
* [Support](#support)
|
||||||
* [Tests](#tests)
|
* [Tests](#tests)
|
||||||
* [Changelog](https://gitlab.puppetsoft.com/12WW1160/cd_nrpe/blob/master/CHANGELOG.md)
|
* [Changelog](https://gitlab.confdroid.com/12WW1160/cd_nrpe/blob/master/CHANGELOG.md)
|
||||||
* [Contact Us](https://confdroid.com/contact/)
|
* [Contact Us](https://confdroid.com/contact/)
|
||||||
* [Disclaimer](#disclaimer)
|
* [Disclaimer](#disclaimer)
|
||||||
|
|
||||||
@@ -56,10 +56,10 @@ The full puppet html documentation is available in docs/index.html
|
|||||||
### Dependencies
|
### Dependencies
|
||||||
All dependencies must be included in the catalogue.
|
All dependencies must be included in the catalogue.
|
||||||
|
|
||||||
* [cd_resources](https://gitlab.puppetsoft.com/12WW1160/cd_resources) to manage YUM repositories.
|
* [cd_resources](https://gitlab.confdroid.com/12WW1160/cd_resources) to manage YUM repositories.
|
||||||
* [cd_firewall](https://gitlab.puppetsoft.com/12WW1160/cd_firewall) or [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall) to manage iptables
|
* [cd_firewall](https://gitlab.confdroid.com/12WW1160/cd_firewall) or [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall) to manage iptables
|
||||||
* [cd_stdlib](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) to facilitate concat
|
* [cd_stdlib](https://gitlab.confdroid.com/12WW1160/cd_stdlib) or [puppetlabs stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) to facilitate concat
|
||||||
* [cd_concat](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs concat](https://github.com/puppetlabs/puppetlabs-concat) for concatenating files
|
* [cd_concat](https://gitlab.confdroid.com/12WW1160/cd_stdlib) or [puppetlabs concat](https://github.com/puppetlabs/puppetlabs-concat) for concatenating files
|
||||||
|
|
||||||
### Deployment
|
### Deployment
|
||||||
`cd_nrpe` does typically not need to be specifically declared. It will be auto-required by `cd_nagios` with default settings. Only if you want to override settings declare it specifically.
|
`cd_nrpe` does typically not need to be specifically declared. It will be auto-required by `cd_nagios` with default settings. Only if you want to override settings declare it specifically.
|
||||||
|
|||||||
Reference in New Issue
Block a user