confdroid/confdroid_selinux
1
0
Fork 0
Code Issues Projects Wiki Activity

updates files

Browse Source
This commit is contained in:
Arne Teuke
2018-04-12 15:03:38 +02:00
parent 796477adbd
commit afb28a6ab7
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -19,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

13
Jenkinsfile vendored
View File

@@ -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,10 +24,11 @@ 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 \\
--no-140chars-check \\
--no-arrow_alignment-check \\ --no-arrow_alignment-check \\
--no-autoloader_layout-check \\ --no-autoloader_layout-check \\
--log-format "%{path}:%{line}:%{check}:%{KIND}:%{message}" {} \\;''' --log-format "%{path}:%{line}:%{check}:%{KIND}:%{message}" {} \\;'''
@@ -96,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>
@@ -129,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}}}\'\'\'
@@ -202,9 +203,11 @@ 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"`

10
README.md
View File

@@ -1,6 +1,6 @@
|Repo Name| version | Build Status| |Repo Name| version | Build Status|
|---|---|---|---| |---|---|---|---|
|`cd_selinux`| 0.0.1.1 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_selinux)](https://jenkins.confdroid.com/job/cd_selinux/)| |`cd_selinux`| 0.0.1.1 | [![Build Status](https://pipelines.confdroid.com/buildStatus/icon?job=cd_selinux)](https://pipelines.confdroid.com/job/cd_selinux/)|
### Synopsis ### Synopsis
[Security-Enhanced Linux (SELinux) is a Linux kernel security module that provides a mechanism for supporting access control security policies.](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) [Security-Enhanced Linux (SELinux) is a Linux kernel security module that provides a mechanism for supporting access control security policies.](https://en.wikipedia.org/wiki/Security-Enhanced_Linux)
@@ -12,7 +12,7 @@
### Table of Contents ### Table of Contents
* [Features](#features) * [Features](#features)
* [Repo Structure](https://gitlab.puppetsoft.com/12WW1160/cd_selinux/blob/master/REPOSTRUCTURE.md) * [Repo Structure](https://gitlab.confdroid.com/12WW1160/cd_selinux/blob/master/REPOSTRUCTURE.md)
* [Dependencies](#dependencies) * [Dependencies](#dependencies)
* [Deployment](#deployment) * [Deployment](#deployment)
* [native Puppet deployment](#native-puppet-deployment) * [native Puppet deployment](#native-puppet-deployment)
@@ -24,7 +24,7 @@
* [Known Problems](#known-problems) * [Known Problems](#known-problems)
* [Support](#support) * [Support](#support)
* [Tests](#tests) * [Tests](#tests)
* [Changelog](https://gitlab.puppetsoft.com/12WW1160/cd_selinux/blob/master/CHANGELOG.md) * [Changelog](https://gitlab.confdroid.com/12WW1160/cd_selinux/blob/master/CHANGELOG.md)
* [Contact Us](https://confdroid.com/contact/) * [Contact Us](https://confdroid.com/contact/)
* [Disclaimer](#disclaimer) * [Disclaimer](#disclaimer)
@@ -45,7 +45,7 @@ Repostructure has moved to REPOSTRUCTURE.md in repo.
### 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) for yum repo resources. * [cd_resources](https://gitlab.confdroid.com/12WW1160/cd_resources) for yum repo resources.
### Deployment ### Deployment
@@ -55,7 +55,7 @@ via site.pp or nodes.pp
``` ```
node 'example.example.net' { node 'example.example.net' {
include cd_puppetdb include cd_selinux
} }
``` ```
#### through Foreman: #### through Foreman: