added development branch

This commit is contained in:
Arne Teuke
2018-04-12 12:51:20 +02:00
parent 97d5e78a43
commit fb3ee3d3d3
3 changed files with 14 additions and 13 deletions

View File

@@ -11,6 +11,7 @@ gem 'puppet-strings'
gem 'rake'
gem 'semantic_puppet'
gem 'rgen'
gem 'public_suffix', '<= 2.0.5'
# rspec must be v2 for ruby 1.8.7
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'
else
# rubocop requires ruby >= 1.9
gem 'rubocop'
gem 'rubocop', '<= 0.50.0'
end

10
Jenkinsfile vendored
View File

@@ -7,7 +7,7 @@ pipeline {
stage('pulling master before adding files') {
steps {
sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) {
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh '''git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com
git pull origin master
@@ -24,7 +24,7 @@ pipeline {
stage('puppet-lint tests') {
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-variable_scope-check \\
--no-80chars-check \\
@@ -97,7 +97,7 @@ Changelog of Git Changelog.
{{#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>
<h3>{{{messageTitle}}}</h3>
@@ -130,7 +130,7 @@ Changelog of Git Changelog.
{{/hasIssue}}
{{#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}}}\'\'\'
@@ -207,7 +207,7 @@ Changelog of Git Changelog.
stage('recommit changes to repo') {
steps {
sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) {
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh '''git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com
echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"`

View File

@@ -1,6 +1,6 @@
|Repo Name| version | Build Status|
|---|---|---|---|
|`cd_nrpe`| 0.0.1.1 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nrpe)](https://jenkins.confdroid.com/job/cd_nrpe/)|
|`cd_nrpe`| 0.0.1.1 | [![Build Status](https://pipelines.confdroid.com/buildStatus/icon?job=cd_nrpe)](https://pipelines.confdroid.com/job/cd_nrpe/)|
### Synopsis
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
* [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)
* [Dependencies](#dependencies)
* [Deployment](#deployment)
@@ -24,7 +24,7 @@ NRPE allows monitoring tools like NAGIOS or ICINGA to connect to clients for mon
* [Known Problems](#known-problems)
* [Support](#support)
* [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/)
* [Disclaimer](#disclaimer)
@@ -56,10 +56,10 @@ The full puppet html documentation is available in docs/index.html
### Dependencies
All dependencies must be included in the catalogue.
* [cd_resources](https://gitlab.puppetsoft.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_stdlib](https://gitlab.puppetsoft.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_resources](https://gitlab.confdroid.com/12WW1160/cd_resources) to manage YUM repositories.
* [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.confdroid.com/12WW1160/cd_stdlib) or [puppetlabs stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) to facilitate concat
* [cd_concat](https://gitlab.confdroid.com/12WW1160/cd_stdlib) or [puppetlabs concat](https://github.com/puppetlabs/puppetlabs-concat) for concatenating files
### 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.