From afb28a6ab786d1373ac338460057f74fedfab236 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 12 Apr 2018 15:03:38 +0200 Subject: [PATCH 1/2] updates files --- Gemfile | 2 +- Jenkinsfile | 13 ++++++++----- README.md | 10 +++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index ba360ff..628327e 100644 --- a/Gemfile +++ b/Gemfile @@ -19,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 diff --git a/Jenkinsfile b/Jenkinsfile index e88dff1..f40a842 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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,10 +24,11 @@ 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 \\ + --no-140chars-check \\ --no-arrow_alignment-check \\ --no-autoloader_layout-check \\ --log-format "%{path}:%{line}:%{check}:%{KIND}:%{message}" {} \\;''' @@ -96,7 +97,7 @@ Changelog of Git Changelog. {{#commits}} -{{hash}} {{authorName}} {{commitTime}} +{{hash}} {{authorName}} {{commitTime}}

{{{messageTitle}}}

@@ -129,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}}}\'\'\' @@ -202,9 +203,11 @@ 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"` diff --git a/README.md b/README.md index 4865b89..c3fb8c8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |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 [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 * [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) * [Deployment](#deployment) * [native Puppet deployment](#native-puppet-deployment) @@ -24,7 +24,7 @@ * [Known Problems](#known-problems) * [Support](#support) * [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/) * [Disclaimer](#disclaimer) @@ -45,7 +45,7 @@ Repostructure has moved to REPOSTRUCTURE.md in repo. ### Dependencies 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 @@ -55,7 +55,7 @@ via site.pp or nodes.pp ``` node 'example.example.net' { - include cd_puppetdb + include cd_selinux } ``` #### through Foreman: From be769300578582487d02055c34f209a0e5ed2196 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Thu, 12 Apr 2018 15:04:08 +0200 Subject: [PATCH 2/2] recommit for updates in build 1 --- CHANGELOG.md | 34 +++++++++----- REPOSTRUCTURE.md | 45 ------------------- doc/_index.html | 8 ++-- doc/css/style.css | 7 +++ doc/file.README.html | 16 +++---- doc/frames.html | 2 +- doc/index.html | 16 +++---- doc/puppet_classes/cd_selinux.html | 6 +-- .../cd_selinux_3A_3Amain_3A_3Aconfig.html | 6 +-- .../cd_selinux_3A_3Amain_3A_3Adirs.html | 6 +-- .../cd_selinux_3A_3Amain_3A_3Afiles.html | 6 +-- .../cd_selinux_3A_3Amain_3A_3Ainstall.html | 6 +-- .../cd_selinux_3A_3Aparams.html | 6 +-- doc/top-level-namespace.html | 6 +-- tests/UTF_Files | 1 + 15 files changed, 62 insertions(+), 109 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32a0453..e915d5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,22 +8,32 @@ Changelog of Git Changelog.

No issue

-199800e57a69be9 Jenkins Server 2017-08-03 11:35:51 +05458ff2dd3dbd6 Arne Teuke 2017-09-18 14:54:11 +

+

added gem spec for public_suffixes

+ +

+f1beb8fd882dbc3 Jenkins Server 2017-09-18 14:52:12 +

+

recommit for updates in build 8

+ +

+199800e57a69be9 Jenkins Server 2017-08-03 11:35:51

recommit for updates in build 7

-73df1183c06d683 Jenkins Server 2017-07-20 12:47:36 +73df1183c06d683 Jenkins Server 2017-07-20 12:47:36

recommit for updates in build 4

-dfeece2215322e3 Jenkins Server 2017-07-20 12:43:32 +dfeece2215322e3 Jenkins Server 2017-07-20 12:43:32

recommit for updates in build 3

-c7e77e4c88c5b5a Jenkins Server 2017-07-20 12:08:03 +c7e77e4c88c5b5a Jenkins Server 2017-07-20 12:08:03

recommit for updates in build 2

@@ -33,17 +43,17 @@ Changelog of Git Changelog.

No issue

-0bd13076fd01a31 Arne Teuke 2017-08-03 11:36:11 +0bd13076fd01a31 Arne Teuke 2017-08-03 11:36:11

updated parameter documentation and README

-a1177ccacf0d7d5 Arne Teuke 2017-08-03 11:24:18 +a1177ccacf0d7d5 Arne Teuke 2017-08-03 11:24:18

added selinux status configuration

-914509740f787b8 Arne Teuke 2017-08-03 11:19:53 +914509740f787b8 Arne Teuke 2017-08-03 11:19:53

added selinux status configuration

@@ -53,27 +63,27 @@ Changelog of Git Changelog.

No issue

-8b184516c46ea66 Arne Teuke 2017-07-20 12:47:27 +8b184516c46ea66 Arne Teuke 2017-07-20 12:47:27

edited README

-6e8e556e2e2f7ef Arne Teuke 2017-07-20 12:46:33 +6e8e556e2e2f7ef Arne Teuke 2017-07-20 12:46:33

changed repo dependency

-9f8a0aef46d59dd Arne Teuke 2017-07-20 12:43:17 +9f8a0aef46d59dd Arne Teuke 2017-07-20 12:43:17

added main config file control

-8b0100d73a0a456 Arne Teuke 2017-07-20 12:07:11 +8b0100d73a0a456 Arne Teuke 2017-07-20 12:07:11

added main config file control

-d6485074480abf9 Arne Teuke 2017-07-20 11:49:07 +d6485074480abf9 Arne Teuke 2017-07-20 11:49:07

added main directory control

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index e52941a..8b13789 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -1,46 +1 @@ -. -|-- doc -| |-- css -| | |-- common.css -| | |-- full_list.css -| | `-- style.css -| |-- js -| | |-- app.js -| | |-- full_list.js -| | `-- jquery.js -| |-- puppet_classes -| | |-- cd_selinux_3A_3Adirs.html -| | |-- cd_selinux_3A_3Amain_3A_3Aconfig.html -| | |-- cd_selinux_3A_3Amain_3A_3Adirs.html -| | |-- cd_selinux_3A_3Amain_3A_3Afiles.html -| | |-- cd_selinux_3A_3Amain_3A_3Ainstall.html -| | |-- cd_selinux_3A_3Aparams.html -| | `-- cd_selinux.html -| |-- file.README.html -| |-- frames.html -| |-- _index.html -| |-- index.html -| |-- puppet_class_list.html -| `-- top-level-namespace.html -|-- manifests -| |-- main -| | |-- config.pp -| | |-- dirs.pp -| | |-- files.pp -| | `-- install.pp -| |-- init.pp -| `-- params.pp -|-- templates -| `-- main -| `-- selinux_config.erb -|-- tests -| `-- UTF_Files -|-- CHANGELOG.md -|-- Gemfile -|-- Gemfile.lock -|-- Jenkinsfile -|-- LICENSE -|-- README.md -`-- REPOSTRUCTURE.md -9 directories, 34 files diff --git a/doc/_index.html b/doc/_index.html index 2b5c490..d30ba73 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -4,7 +4,7 @@ - Documentation by YARD 0.9.9 + Documentation by YARD 0.9.12 @@ -52,7 +52,7 @@
-

Documentation by YARD 0.9.9

+

Documentation by YARD 0.9.12

Alphabetic Index

@@ -127,9 +127,7 @@
diff --git a/doc/css/style.css b/doc/css/style.css index f682a69..57e8f9d 100644 --- a/doc/css/style.css +++ b/doc/css/style.css @@ -484,6 +484,13 @@ pre.code .rubyid_backref, pre.code .rubyid_nth_ref { color: #6D79DE; } pre.code .regexp, .dregexp { color: #036A07; } pre.code a { border-bottom: 1px dotted #bbf; } +/* inline code */ +p > code { + padding: 1px 3px 1px 3px; + border: 1px solid #E1E1E8; + background: #F7F7F9; + border-radius: 4px; +} /* Color fix for links */ #content .summary_desc pre.code .id > .object_link a, /* identifier */ diff --git a/doc/file.README.html b/doc/file.README.html index 7f9155e..895f4f4 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -6,7 +6,7 @@ File: README - — Documentation by YARD 0.9.9 + — Documentation by YARD 0.9.12 @@ -62,7 +62,7 @@ Status| |---|---|---|---| |cd_selinux| 0.0.1.1 | {Build +href="https://pipelines.confdroid.com/buildStatus/icon?job=cd_selinux">{Build Status/]|

Synopsis

@@ -90,7 +90,7 @@ production!!! __**

Features

  • Repo +href="https://gitlab.confdroid.com/12WW1160/cd_selinux/blob/master/REPOSTRUCTURE.md">Repo Structure

  • Dependencies

    @@ -116,7 +116,7 @@ Structure

    Tests

  • Changelog

    +href="https://gitlab.confdroid.com/12WW1160/cd_selinux/blob/master/CHANGELOG.md">Changelog

  • Contact Us

  • @@ -143,7 +143,7 @@ permissions, selinux context, content)

    All dependencies must be included in the catalogue.

    • cd_resources +href="https://gitlab.confdroid.com/12WW1160/cd_resources">cd_resources for yum repo resources.

    @@ -154,7 +154,7 @@ for yum repo resources.

    via site.pp or nodes.pp

    node 'example.example.net' {
-  include cd_puppetdb
+  include cd_selinux
 }

    through Foreman:

    @@ -251,9 +251,7 @@ environments.

    • diff --git a/doc/frames.html b/doc/frames.html index 0cb1371..42ca6b6 100644 --- a/doc/frames.html +++ b/doc/frames.html @@ -2,7 +2,7 @@ - Documentation by YARD 0.9.9 + Documentation by YARD 0.9.12