From 6e8e556e2e2f7ef289b4cf68643b6736bc0a9d82 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 20 Jul 2017 13:46:33 +0100 Subject: [PATCH 1/3] changed repo dependency --- manifests/main/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/main/install.pp b/manifests/main/install.pp index 1de7298..7b00f45 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -25,7 +25,7 @@ class cd_selinux::main::install ( ) inherits cd_selinux::params { - require cd_selinux::main::yumrepo + require cd_resources package {$reqpackages_main: ensure => $pkg_ensure, From 8b184516c46ea662e6bcec715fe4975a9c79a003 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 20 Jul 2017 13:47:27 +0100 Subject: [PATCH 2/3] edited README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 787852f..fe0642b 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,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. ### Deployment From 73df1183c06d683967d17c382743ef876be75218 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 14:47:36 +0200 Subject: [PATCH 3/3] recommit for updates in build 4 --- CHANGELOG.md | 10 ++++++++++ REPOSTRUCTURE.md | 3 ++- doc/_index.html | 2 +- doc/file.README.html | 7 ++++++- doc/index.html | 7 ++++++- doc/puppet_classes/cd_selinux.html | 2 +- .../cd_selinux_3A_3Amain_3A_3Aconfig.html | 2 +- doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_selinux_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_selinux_3A_3Amain_3A_3Ainstall.html | 4 ++-- doc/puppet_classes/cd_selinux_3A_3Aparams.html | 2 +- doc/top-level-namespace.html | 2 +- 12 files changed, 33 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03edcf8..d84c8b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

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

+

recommit for updates in build 3

+ +

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

+

added main config file control

+ +

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

recommit for updates in build 2

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index be9403a..e52941a 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -11,6 +11,7 @@ | |-- 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 @@ -42,4 +43,4 @@ |-- README.md `-- REPOSTRUCTURE.md -9 directories, 33 files +9 directories, 34 files diff --git a/doc/_index.html b/doc/_index.html index 977fafb..783b653 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -127,7 +127,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index e341982..c1eb430 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -135,6 +135,11 @@ href="https://gitlab.puppetsoft.com/12WW1160/cd_selinux/blob/master/CHANGELOG.md

Dependencies

All dependencies must be included in the catalogue.

+

Deployment

@@ -230,7 +235,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 2983676..c9256b1 100644 --- a/doc/index.html +++ b/doc/index.html @@ -135,6 +135,11 @@ href="https://gitlab.puppetsoft.com/12WW1160/cd_selinux/blob/master/CHANGELOG.md

Dependencies

All dependencies must be included in the catalogue.

+

Deployment

@@ -230,7 +235,7 @@ environments.

diff --git a/doc/puppet_classes/cd_selinux.html b/doc/puppet_classes/cd_selinux.html index 99882bb..4f7805a 100644 --- a/doc/puppet_classes/cd_selinux.html +++ b/doc/puppet_classes/cd_selinux.html @@ -139,7 +139,7 @@ class cd_selinux { diff --git a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Aconfig.html index 005ac4b..0cf33b7 100644 --- a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Aconfig.html @@ -155,7 +155,7 @@ class cd_selinux::main::config ( diff --git a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Adirs.html index 2e918af..82a5f5b 100644 --- a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Adirs.html @@ -176,7 +176,7 @@ class cd_selinux::main::dirs ( diff --git a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Afiles.html index 1b1340e..0551e81 100644 --- a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Afiles.html @@ -178,7 +178,7 @@ class cd_selinux::main::files ( diff --git a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Ainstall.html index a860578..5453a38 100644 --- a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Ainstall.html @@ -154,7 +154,7 @@ class cd_selinux::main::install ( ) inherits cd_selinux::params { - require cd_selinux::main::yumrepo + require cd_resources package {$reqpackages_main: ensure => $pkg_ensure, @@ -173,7 +173,7 @@ class cd_selinux::main::install ( diff --git a/doc/puppet_classes/cd_selinux_3A_3Aparams.html b/doc/puppet_classes/cd_selinux_3A_3Aparams.html index 941345a..8423e83 100644 --- a/doc/puppet_classes/cd_selinux_3A_3Aparams.html +++ b/doc/puppet_classes/cd_selinux_3A_3Aparams.html @@ -299,7 +299,7 @@ $sx_main_file_erb = 'cd_selinux/main/selinux_config.erb' diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index f1a538a..6b10d87 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@