From 9f8a0aef46d59dd60c63477b3161be40c2e8137e Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 20 Jul 2017 13:43:17 +0100 Subject: [PATCH 1/2] added main config file control --- manifests/main/dirs.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index 32dcdfe..41d0878 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -1,4 +1,4 @@ -## cd_selinux::dirs.pp +## cd_selinux::main::dirs.pp # Module name: cd_selinux # Author: Arne Teuke (arne_teuke@ConfDroid.com) # # License: @@ -20,7 +20,7 @@ # along with this program. If not, see . # @summary Class manages all directories required for cd_selinux. ############################################################################### -class cd_selinux::dirs ( +class cd_selinux::main::dirs ( ) inherits cd_selinux::params { From dfeece2215322e37b16ca34a4aa619fe55c27a89 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 14:43:32 +0200 Subject: [PATCH 2/2] recommit for updates in build 3 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 30 ++- doc/_index.html | 6 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_class_list.html | 8 +- doc/puppet_classes/cd_selinux.html | 2 +- .../cd_selinux_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_selinux_3A_3Amain_3A_3Adirs.html | 186 ++++++++++++++++++ .../cd_selinux_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_selinux_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_selinux_3A_3Aparams.html | 4 +- doc/top-level-namespace.html | 2 +- 13 files changed, 240 insertions(+), 18 deletions(-) create mode 100644 doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Adirs.html diff --git a/CHANGELOG.md b/CHANGELOG.md index a95d9d2..03edcf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

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

+

recommit for updates in build 2

+ +

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

+

added main config file control

+ +

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

added main directory control

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index eb5f35d..be9403a 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -1,4 +1,26 @@ . +|-- 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_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 @@ -10,10 +32,14 @@ |-- templates | `-- main | `-- selinux_config.erb +|-- tests +| `-- UTF_Files +|-- CHANGELOG.md |-- Gemfile |-- Gemfile.lock |-- Jenkinsfile |-- LICENSE -`-- README.md +|-- README.md +`-- REPOSTRUCTURE.md -4 directories, 12 files +9 directories, 33 files diff --git a/doc/_index.html b/doc/_index.html index 60f4e67..977fafb 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -74,12 +74,12 @@
  • - cd_selinux::dirs + cd_selinux::main::config
  • - cd_selinux::main::config + cd_selinux::main::dirs
    • @@ -127,7 +127,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index df01d72..e341982 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -230,7 +230,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 9330262..2983676 100644 --- a/doc/index.html +++ b/doc/index.html @@ -230,7 +230,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 5b7c278..213a4bc 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -43,16 +43,16 @@ -
  • +
  • - cd_selinux::dirs + cd_selinux::main::config
    • -
  • +
  • - cd_selinux::main::config + cd_selinux::main::dirs
    • diff --git a/doc/puppet_classes/cd_selinux.html b/doc/puppet_classes/cd_selinux.html index 5a80bde..99882bb 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 70fbfeb..005ac4b 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 new file mode 100644 index 0000000..2e918af --- /dev/null +++ b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Adirs.html @@ -0,0 +1,186 @@ + + + + + + + Puppet Class: cd_selinux::main::dirs + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_selinux::main::dirs

    +
    + +
    +
    Inherits:
    +
    cd_selinux::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/main/dirs.pp +
    +
    +
    + +

    Summary

    + Class manages all directories required for cd_selinux. + +

    Overview

    +
    +
    + +

    cd_selinux::main::dirs.pp +Module name: cd_selinux +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

    + +

    License:

    + +

    This file is part of cd_selinux.

    + +

    cd_selinux is used for providing automatic configuration of SELINUX + +Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com) + This program is +free software: you can redistribute it and/or modify + it under the terms of +the GNU General Public License as published by + the Free Software +Foundation, either version 3 of the License, or + (at your option) any later +version.

    + +

    This program is distributed in the hope that it will be useful, + but +WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License +for more details.

    + +

    You should have received a copy of the GNU General Public License + along +with this program. If not, see www.gnu.org/licenses/.

    + +
    +
    +
    + + +
    + + + + + +
    + 
    +
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
    +     		+ 
    # File 'manifests/main/dirs.pp', line 23
+
+class cd_selinux::main::dirs (
+
+) inherits cd_selinux::params {
+
+  require cd_selinux::main::install
+
+  file { $sx_main_dir:
+    ensure    =>  directory,
+    path      =>  $sx_main_dir,
+    owner     =>  'root',
+    group     =>  'root',
+    mode      =>  '0755',
+    selrange  =>  s0,
+    selrole   =>  object_r,
+    seltype   =>  selinux_config_t,
+    seluser   =>  system_u,
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file 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 73046f7..1b1340e 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 58a674a..a860578 100644 --- a/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_selinux_3A_3Amain_3A_3Ainstall.html @@ -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 a99d651..941345a 100644 --- a/doc/puppet_classes/cd_selinux_3A_3Aparams.html +++ b/doc/puppet_classes/cd_selinux_3A_3Aparams.html @@ -67,7 +67,7 @@
    Inherited by:
    - cd_selinux::dirs
    + cd_selinux::main::dirs
    cd_selinux::main::files
    @@ -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 8f9fd05..f1a538a 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@