From 58b8456bc55442de19e4ee57ba4d963fa082b796 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 1 Dec 2020 18:04:44 +0100 Subject: [PATCH 1/8] recommit for updates in build 24 --- REPOSTRUCTURE.md | 3 +-- doc/file.README.html | 3 --- doc/index.html | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 3104dd4..62b601d 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -53,11 +53,10 @@ | `-- welcome.conf |-- tests | `-- UTF_Files -|-- CHANGELOG.md |-- Gemfile |-- Gemfile.lock |-- Jenkinsfile |-- LICENSE `-- README.md -12 directories, 48 files +12 directories, 47 files diff --git a/doc/file.README.html b/doc/file.README.html index 1b40b84..146d619 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -109,9 +109,6 @@ production!!! __**

  • Tests

  • -

    Changelog

    -

  • Contact Us

  • Disclaimer

    diff --git a/doc/index.html b/doc/index.html index 9a7da13..62c8ee1 100644 --- a/doc/index.html +++ b/doc/index.html @@ -109,9 +109,6 @@ production!!! __**

  • Tests

  • -

    Changelog

    -

  • Contact Us

  • Disclaimer

    From 092a873e85cdac7581cffb561d3bf698f7a87c3d Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 1 Dec 2020 18:06:22 +0100 Subject: [PATCH 2/8] recommit for updates in build 25 --- doc/file.README.html | 3 +-- doc/index.html | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index 146d619..d4942a6 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -58,8 +58,7 @@
    -

    |Repo Name| version | Build Status| |—|—|—|—| |cd_apache| -1.1.2.8 | |

    Synopsis

    diff --git a/doc/index.html b/doc/index.html index 62c8ee1..9e6af35 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,8 +58,7 @@
    -

    |Repo Name| version | Build Status| |—|—|—|—| |cd_apache| -1.1.2.8 | |

    Synopsis

    From 9792d872fcfe77ba7184aff29bc0605220da7483 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 8 Dec 2020 16:34:29 +0100 Subject: [PATCH 3/8] recommit for updates in build 28 --- doc/file.README.html | 2 +- doc/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index d4942a6..191d16f 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -59,7 +59,7 @@

    |

    +src="https://pipelines.confdroid.com/buildStatus/icon?job=cd_apache">

    Synopsis

    diff --git a/doc/index.html b/doc/index.html index 9e6af35..de6e8f5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -59,7 +59,7 @@

    |

    +src="https://pipelines.confdroid.com/buildStatus/icon?job=cd_apache">

    Synopsis

    From 44f528225d6b8d131d18a0629b50e7586b136ca3 Mon Sep 17 00:00:00 2001 From: 12ww1160 Date: Thu, 5 Aug 2021 14:18:32 +0000 Subject: [PATCH 4/8] Delete REPOSTRUCTURE.md --- REPOSTRUCTURE.md | 62 ------------------------------------------------ 1 file changed, 62 deletions(-) delete mode 100644 REPOSTRUCTURE.md diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md deleted file mode 100644 index 62b601d..0000000 --- a/REPOSTRUCTURE.md +++ /dev/null @@ -1,62 +0,0 @@ -. -|-- doc -| |-- css -| | |-- common.css -| | |-- full_list.css -| | `-- style.css -| |-- js -| | |-- app.js -| | |-- full_list.js -| | `-- jquery.js -| |-- puppet_classes -| | |-- cd_apache_3A_3Afirewall_3A_3Aiptables.html -| | |-- cd_apache_3A_3Amain_3A_3Aconfig.html -| | |-- cd_apache_3A_3Amonitoring_3A_3Atarget.html -| | |-- cd_apache_3A_3Aparams.html -| | |-- cd_apache_3A_3Aserver_3A_3Adirs.html -| | |-- cd_apache_3A_3Aserver_3A_3Afiles.html -| | |-- cd_apache_3A_3Aserver_3A_3Ainstall.html -| | |-- cd_apache_3A_3Aserver_3A_3Aservice.html -| | |-- cd_apache_3A_3Aserver_3A_3Auser.html -| | `-- cd_apache.html -| |-- file.README.html -| |-- frames.html -| |-- _index.html -| |-- index.html -| |-- puppet_class_list.html -| `-- top-level-namespace.html -|-- examples -| |-- vhost.erb -| `-- vhost_ssl.erb -|-- manifests -| |-- firewall -| | `-- iptables.pp -| |-- main -| | `-- config.pp -| |-- monitoring -| | `-- target.pp -| |-- server -| | |-- dirs.pp -| | |-- files.pp -| | |-- install.pp -| | |-- service.pp -| | `-- user.pp -| |-- init.pp -| `-- params.pp -|-- templates -| |-- autoindex_conf.erb -| |-- httpd_conf.erb -| |-- index_html.erb -| |-- magic.erb -| |-- ssl_conf.erb -| |-- userdir_conf.erb -| `-- welcome.conf -|-- tests -| `-- UTF_Files -|-- Gemfile -|-- Gemfile.lock -|-- Jenkinsfile -|-- LICENSE -`-- README.md - -12 directories, 47 files From 29e7ce916c736c3b48dc7769416dd9a260bc116d Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Thu, 5 Aug 2021 16:41:08 +0200 Subject: [PATCH 5/8] recommit for updates in build 42 --- .scannerwork/.sonar_lock | 0 .scannerwork/class-mapping.csv | 0 .scannerwork/report-task.txt | 6 ++ doc/file.README.html | 157 ++++++++++++++------------------- doc/index.html | 157 ++++++++++++++------------------- 5 files changed, 136 insertions(+), 184 deletions(-) create mode 100644 .scannerwork/.sonar_lock create mode 100644 .scannerwork/class-mapping.csv create mode 100644 .scannerwork/report-task.txt diff --git a/.scannerwork/.sonar_lock b/.scannerwork/.sonar_lock new file mode 100644 index 0000000..e69de29 diff --git a/.scannerwork/class-mapping.csv b/.scannerwork/class-mapping.csv new file mode 100644 index 0000000..e69de29 diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt new file mode 100644 index 0000000..bb355c5 --- /dev/null +++ b/.scannerwork/report-task.txt @@ -0,0 +1,6 @@ +projectKey=cd_apache +serverUrl=http://sonarqube.confdroid.com +serverVersion=7.9.1.27448 +dashboardUrl=http://sonarqube.confdroid.com/dashboard?id=cd_apache +ceTaskId=AXsWwrqVYo9HjDKVQ1fg +ceTaskUrl=http://sonarqube.confdroid.com/api/ce/task?id=AXsWwrqVYo9HjDKVQ1fg diff --git a/doc/file.README.html b/doc/file.README.html index 191d16f..d2a4098 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -58,10 +58,14 @@
    -

    +

    README

    -

    Synopsis

    +

    |

    + +

    [[TOC]]

    + +

    Synopsis

    Apache httpd is a very powerful and widely used web server.

    @@ -70,7 +74,7 @@ httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case.

    -

    WARNING

    +

    WARNING

    **__!!! Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and @@ -80,56 +84,43 @@ test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production!!! __**

    -

    Table of Contents

    +

    Features

    + +

    Installation

    -

    Features

    - -

    Installation * install required binaries and dependencies

    - -

    Configuration * manage user settings (optional) * manage directory -structure (optional) * manage configuration files (optional): * file -system permissions * selinux context * manage firewall settings (optional) -* manage nagios monitoring (optional) Maintenance * manage the service

    - -

    vHosts

    - -

    As stated in the ynopsis, this module was written particularly for usage as -base module. Apache httpd has a great number of usae cases -where it actually is not used directly as full blown webser, but instead as -'sub-service'. Examples here would be

    +

    Configuration

    • -

      frontend proxy for other applications to avoid having to put the port +

      manage user settings (optional)

      +
    • +

      manage directory structure (optional)

      +
    • +

      manage configuration files (optional):

      +
    • +

      file system permissions

      +
    • +

      selinux context

      +
    • +

      manage firewall settings (optional)

      +
    • +

      manage nagios monitoring (optional)

      +
    + +

    Maintenance

    +
    • +

      manage the service

      +
    + +

    vHosts

    + +

    As stated in the synopsis, this module was written particularly for usage +as base module. Apache httpd has a great number of use cases +where it actually is not used directly as full-blown web server by itself, +but instead as platform for other applications. Examples here would be:

    +
    • +

      front-end proxy for other applications to avoid having to put the port number into the URL

    • applications like phpMyAdmin, phpPgAdmin

      @@ -145,14 +136,10 @@ to run a plain fully fledged web server, you would use a role- or profile class/module on top of cd_apache to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would -create a define for vhosts, i.e. using the example parameters, and simply +create a define for vHosts, i.e. using the example parameters, and simply add cd_apache as requirement (i.e. require cd_apache) so it gets installed automatically.

      -

      Repo Structure

      - -

      Repostructure as been moved to REPOSTRUCTURE.md

      -

      Dependencies

      All dependencies must be included in the catalogue.

      @@ -161,72 +148,52 @@ gets installed automatically.

      href="https://gitlab.confdroid.com/12WW1160/cd_resources">cd_resources

    -

    Deployment

    - -
    native Puppet deployment
    +

    Deployment

    +
    • +

      native Puppet deployment

      +

    via site.pp or nodes.pp

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

    through Foreman:

    +
    • +

      through Foreman:

      +

    In order to apply parameters through Foreman, -cd_apache::params must be added to the host or hostgroup +cd_apache::params must be added to the host or host group in question.

    See more details about class deployment on Confdroid.com.

    -

    Parameters

    +

    Parameters

    -

    The following parameters are editable via params.pp or through ENC -(recommended). Values changed will take immediate effect -at next puppet run. Services will be restarted where neccessary.

    +

    The parameters are documented via puppet strings and listed here. Simply open in web browser.

    -

    Mandatory Parameters

    - -

    Optional Parameters

    -
    • -

      $ae_manage_user : Whether or not to manage the user settings. -Important when accessing shared resources accross nodes. Defaults to -false.

      -
    • -

      $ae_manage_cfg : Whether or not to manage the apache -configuration. Defaults to false as this module is meant to be -used through profiles or roles or other modules.

      -
    • -

      $ae_manage_dirs : Whether or not to manage the directory -structure. Defaults to true.

      -
    • -

      $ae_allow_user_dirs : Whether or not to allow presenting -content from end user home directories. Defaults to false.

      -
    - -

    SELINUX

    +

    SELINUX

    All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.

    -

    Known Problems

    - -

    Support

    +

    Support

    • OS: CentOS 7

    • Puppet 5

    -

    Tests

    +

    Tests

    • Puppet Lint

    • excluded tests:

      • -

        --no-class_inherits_from_params_class-check:relavant only to +

        --no-class_inherits_from_params_class-check:relevant only to non-supported outdated puppet versions

      • --no-variable_scope-check: not applicable as we are inheriting @@ -247,13 +214,19 @@ block, not per class.

        ERB Template Parser

      • Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)

        +
      • +

        Markdown-lint

        +
      • +

        Spellcheck

        +
      • +

        Sonar Quality Gate

      -

      Contact Us

      +

      Contact Us

      contact Us

      -

      Disclaimer

      +

      Disclaimer

      ConfDroid as entity is entirely independent from Puppet. We provide custom configuration modules, written for specific purposes and specific diff --git a/doc/index.html b/doc/index.html index de6e8f5..3640f49 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,10 +58,14 @@

    -

    +

    README

    -

    Synopsis

    +

    |

    + +

    [[TOC]]

    + +

    Synopsis

    Apache httpd is a very powerful and widely used web server.

    @@ -70,7 +74,7 @@ httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case.

    -

    WARNING

    +

    WARNING

    **__!!! Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and @@ -80,56 +84,43 @@ test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production!!! __**

    -

    Table of Contents

    +

    Features

    + +

    Installation

    -

    Features

    - -

    Installation * install required binaries and dependencies

    - -

    Configuration * manage user settings (optional) * manage directory -structure (optional) * manage configuration files (optional): * file -system permissions * selinux context * manage firewall settings (optional) -* manage nagios monitoring (optional) Maintenance * manage the service

    - -

    vHosts

    - -

    As stated in the ynopsis, this module was written particularly for usage as -base module. Apache httpd has a great number of usae cases -where it actually is not used directly as full blown webser, but instead as -'sub-service'. Examples here would be

    +

    Configuration

    • -

      frontend proxy for other applications to avoid having to put the port +

      manage user settings (optional)

      +
    • +

      manage directory structure (optional)

      +
    • +

      manage configuration files (optional):

      +
    • +

      file system permissions

      +
    • +

      selinux context

      +
    • +

      manage firewall settings (optional)

      +
    • +

      manage nagios monitoring (optional)

      +
    + +

    Maintenance

    +
    • +

      manage the service

      +
    + +

    vHosts

    + +

    As stated in the synopsis, this module was written particularly for usage +as base module. Apache httpd has a great number of use cases +where it actually is not used directly as full-blown web server by itself, +but instead as platform for other applications. Examples here would be:

    +
    • +

      front-end proxy for other applications to avoid having to put the port number into the URL

    • applications like phpMyAdmin, phpPgAdmin

      @@ -145,14 +136,10 @@ to run a plain fully fledged web server, you would use a role- or profile class/module on top of cd_apache to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would -create a define for vhosts, i.e. using the example parameters, and simply +create a define for vHosts, i.e. using the example parameters, and simply add cd_apache as requirement (i.e. require cd_apache) so it gets installed automatically.

      -

      Repo Structure

      - -

      Repostructure as been moved to REPOSTRUCTURE.md

      -

      Dependencies

      All dependencies must be included in the catalogue.

      @@ -161,72 +148,52 @@ gets installed automatically.

      href="https://gitlab.confdroid.com/12WW1160/cd_resources">cd_resources

    -

    Deployment

    - -
    native Puppet deployment
    +

    Deployment

    +
    • +

      native Puppet deployment

      +

    via site.pp or nodes.pp

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

    through Foreman:

    +
    • +

      through Foreman:

      +

    In order to apply parameters through Foreman, -cd_apache::params must be added to the host or hostgroup +cd_apache::params must be added to the host or host group in question.

    See more details about class deployment on Confdroid.com.

    -

    Parameters

    +

    Parameters

    -

    The following parameters are editable via params.pp or through ENC -(recommended). Values changed will take immediate effect -at next puppet run. Services will be restarted where neccessary.

    +

    The parameters are documented via puppet strings and listed here. Simply open in web browser.

    -

    Mandatory Parameters

    - -

    Optional Parameters

    -
    • -

      $ae_manage_user : Whether or not to manage the user settings. -Important when accessing shared resources accross nodes. Defaults to -false.

      -
    • -

      $ae_manage_cfg : Whether or not to manage the apache -configuration. Defaults to false as this module is meant to be -used through profiles or roles or other modules.

      -
    • -

      $ae_manage_dirs : Whether or not to manage the directory -structure. Defaults to true.

      -
    • -

      $ae_allow_user_dirs : Whether or not to allow presenting -content from end user home directories. Defaults to false.

      -
    - -

    SELINUX

    +

    SELINUX

    All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.

    -

    Known Problems

    - -

    Support

    +

    Support

    • OS: CentOS 7

    • Puppet 5

    -

    Tests

    +

    Tests

    • Puppet Lint

    • excluded tests:

      • -

        --no-class_inherits_from_params_class-check:relavant only to +

        --no-class_inherits_from_params_class-check:relevant only to non-supported outdated puppet versions

      • --no-variable_scope-check: not applicable as we are inheriting @@ -247,13 +214,19 @@ block, not per class.

        ERB Template Parser

      • Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)

        +
      • +

        Markdown-lint

        +
      • +

        Spellcheck

        +
      • +

        Sonar Quality Gate

      -

      Contact Us

      +

      Contact Us

      contact Us

      -

      Disclaimer

      +

      Disclaimer

      ConfDroid as entity is entirely independent from Puppet. We provide custom configuration modules, written for specific purposes and specific From 2f11332d4a1b44c2fe7a7e4df93aeca42d4687bb Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Thu, 5 Aug 2021 19:32:34 +0200 Subject: [PATCH 6/8] recommit for updates in build 43 --- .scannerwork/report-task.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt index bb355c5..7c5a4b8 100644 --- a/.scannerwork/report-task.txt +++ b/.scannerwork/report-task.txt @@ -2,5 +2,5 @@ projectKey=cd_apache serverUrl=http://sonarqube.confdroid.com serverVersion=7.9.1.27448 dashboardUrl=http://sonarqube.confdroid.com/dashboard?id=cd_apache -ceTaskId=AXsWwrqVYo9HjDKVQ1fg -ceTaskUrl=http://sonarqube.confdroid.com/api/ce/task?id=AXsWwrqVYo9HjDKVQ1fg +ceTaskId=AXsXX67CYo9HjDKVQ1f6 +ceTaskUrl=http://sonarqube.confdroid.com/api/ce/task?id=AXsXX67CYo9HjDKVQ1f6 From e3d969de6248f26acf7d7b7ace9b1008b6678849 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Thu, 9 Sep 2021 14:05:47 +0200 Subject: [PATCH 7/8] recommit for updates in build 44 --- .scannerwork/report-task.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt index 7c5a4b8..9ef3d89 100644 --- a/.scannerwork/report-task.txt +++ b/.scannerwork/report-task.txt @@ -2,5 +2,5 @@ projectKey=cd_apache serverUrl=http://sonarqube.confdroid.com serverVersion=7.9.1.27448 dashboardUrl=http://sonarqube.confdroid.com/dashboard?id=cd_apache -ceTaskId=AXsXX67CYo9HjDKVQ1f6 -ceTaskUrl=http://sonarqube.confdroid.com/api/ce/task?id=AXsXX67CYo9HjDKVQ1f6 +ceTaskId=AXvKcxK_1C1yMMr1H4Dy +ceTaskUrl=http://sonarqube.confdroid.com/api/ce/task?id=AXvKcxK_1C1yMMr1H4Dy From bc69ce110ad5a15fcc06f5c53bc13155cf912d65 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Fri, 10 Sep 2021 12:01:57 +0200 Subject: [PATCH 8/8] recommit for updates in build 45 --- .scannerwork/report-task.txt | 4 ++-- doc/file.README.html | 2 +- doc/index.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt index 9ef3d89..c0b68fc 100644 --- a/.scannerwork/report-task.txt +++ b/.scannerwork/report-task.txt @@ -2,5 +2,5 @@ projectKey=cd_apache serverUrl=http://sonarqube.confdroid.com serverVersion=7.9.1.27448 dashboardUrl=http://sonarqube.confdroid.com/dashboard?id=cd_apache -ceTaskId=AXvKcxK_1C1yMMr1H4Dy -ceTaskUrl=http://sonarqube.confdroid.com/api/ce/task?id=AXvKcxK_1C1yMMr1H4Dy +ceTaskId=AXvPKBFJ1C1yMMr1H4D8 +ceTaskUrl=http://sonarqube.confdroid.com/api/ce/task?id=AXvPKBFJ1C1yMMr1H4D8 diff --git a/doc/file.README.html b/doc/file.README.html index d2a4098..b696f50 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -145,7 +145,7 @@ gets installed automatically.

      All dependencies must be included in the catalogue.

      • cd_resources

        +href="https://sourcecode.confdroid.com/12WW1160/cd_resources">cd_resources

      Deployment

      diff --git a/doc/index.html b/doc/index.html index 3640f49..a97e5ef 100644 --- a/doc/index.html +++ b/doc/index.html @@ -145,7 +145,7 @@ gets installed automatically.

      All dependencies must be included in the catalogue.

      • cd_resources

        +href="https://sourcecode.confdroid.com/12WW1160/cd_resources">cd_resources

      Deployment