diff --git a/.mdl_style.rb b/.mdl_style.rb deleted file mode 100644 index 5d4d3b9..0000000 --- a/.mdl_style.rb +++ /dev/null @@ -1,3 +0,0 @@ -all -rule 'MD013', :line_length => 1000 -exclude_rule 'MD036' diff --git a/.mdlrc b/.mdlrc deleted file mode 100644 index e5c563a..0000000 --- a/.mdlrc +++ /dev/null @@ -1,2 +0,0 @@ -style '.mdl_style.rb' - diff --git a/.spelling b/.spelling deleted file mode 100644 index f102f3d..0000000 --- a/.spelling +++ /dev/null @@ -1,110 +0,0 @@ -# markdown-spellcheck spelling configuration file -# Format - lines begining # are comments -# global dictionary is at the start, file overrides afterwards -# one word per line, to define a file override use ' - filename' -# where filename is relative to this configuration file -Readme.md -httpd -sudo -selinux -site.pp -nodes.pp -cd_apache -:: -params -Foreman -cd_resources -CentOS -Puppet -ConfDroid -nagios -vHosts -vHost -phpMyAdmin -phpPgAdmin -parameterized -erb -Confdroid.com -UTF_Files -Elasticsearch -cd_firewall -puppetlabs -cd_elasticsearch -cd_fail2ban -Fail2Ban -intrusion -fail2ban -firewalld -prevention -management -CentOS7 -auto-installed -filebeat -Elastic -installer -Foreman -postgresql -TLS -cd_foreman -install.sh -git -cd_git -Gitlab -gitlab -gitlab-ce -gitlab.rb -psql -setup -service -user -optional -postgresql -database -via -tls -encryption -certbot -cd_postgresql -cd_certbot -cd_gitlab -sourcecode -pg_hba.conf -hiera -cd_tls -ca_chain -config -gitlab-ctl -haproxy -cd_concat -concat -cd_haproxy -haproxy.cfg -fqdn -ACLs -contineous -Jenkinsfiles -Jenkinsfile -SEEDjob -Github -job-dsl -community -providing -API -REGEX -plugins -cd_jenkins -cd_java -cd_nagios -cd_kibana -Kibana -Elastic -Stack -elasticsearch -cd_kubernetes -Kubernetes -kubeadm -kubeadmin -kubecfg -Grafana -Alloy -params.pp diff --git a/Jenkinsfile b/Jenkinsfile index 915f19d..e541252 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,23 +64,6 @@ pipeline { } } - stage('markdown-lint') { - steps { - sh ''' - source /opt/rh/rh-ruby27/enable - mdl README.md - ''' - } - } - - stage('spell check') { - steps { - sh ''' - mdspell -r -n -a "**/*.md" - ''' - } - } - stage('SonarScan') { steps { sh ''' @@ -93,7 +76,7 @@ pipeline { } } - stage('create Puppet documention') { + stage('create Puppet documentation') { steps { sh '/opt/puppetlabs/bin/puppet strings' } diff --git a/README.md b/README.md index c6bfe97..360947d 100644 --- a/README.md +++ b/README.md @@ -73,9 +73,6 @@ All files and directories are configured with correct selinux context. If selinu * `--no-arrow_alignment-check`: this check leads to actually not having am easily readable arrow alignment, as this checks `per block`, not per class. * Puppet Parser * ERB Template Parser -* Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files) -* Markdown-lint -* Spellcheck * Sonar Quality Gate ## Contact Us diff --git a/manifests/main/config.pp b/manifests/main/config.pp index fa64667..a3d1c78 100644 --- a/manifests/main/config.pp +++ b/manifests/main/config.pp @@ -6,7 +6,5 @@ class cd_alloy::main::config ( ) inherits cd_alloy::params { - include cd_alloy::main::service - } diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index 2096784..0958bb0 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -6,18 +6,17 @@ class cd_alloy::main::dirs ( ) inherits cd_alloy::params { - require cd_alloy::main::install # main config dir file { $ay_main_dir: - ensure => directory, - owner => 'root', - group => 'alloy', - mode => '0770', - selrange => s0, - selrole => object_r, - seltype => etc_t, - seluser => system_u, + ensure => directory, + owner => 'root', + group => 'alloy', + mode => '0770', + selrange => s0, + selrole => object_r, + seltype => etc_t, + seluser => system_u, } } diff --git a/manifests/main/files.pp b/manifests/main/files.pp index e408b71..bf9861e 100644 --- a/manifests/main/files.pp +++ b/manifests/main/files.pp @@ -6,23 +6,21 @@ class cd_alloy::main::files ( ) inherits cd_alloy::params { - require cd_alloy::main::dirs # Ensure log_targets is always an array $log_targets_array = Array($cd_alloy::params::ay_log_targets, true) file { $ay_main_file: - ensure => file, - owner => 'root', - group => 'root', - mode => '0644', - selrange => s0, - selrole => object_r, - seltype => etc_t, - seluser => system_u, - content => template('cd_alloy/config.alloy.erb'), - notify => Service[$ay_service], + ensure => file, + owner => 'root', + group => 'root', + mode => '0644', + selrange => s0, + selrole => object_r, + seltype => etc_t, + seluser => system_u, + content => template('cd_alloy/config.alloy.erb'), + notify => Service[$ay_service], } - } diff --git a/manifests/main/install.pp b/manifests/main/install.pp index a47e3fc..92760cd 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -1,12 +1,11 @@ ## cd_alloy::main::install.pp # Module name: cd_alloy # Author: Arne Teuke (arne_teuke@confdroid.com) -# @summary Class manages module logic for the cd_alloy module +# @summary Class installs packages for the cd_alloy module ############################################################################### class cd_alloy::main::install ( ) inherits cd_alloy::params { - require cd_alloy::main::yumrepo package { $reqpackages: diff --git a/manifests/main/service.pp b/manifests/main/service.pp index 5163427..27c6f6c 100644 --- a/manifests/main/service.pp +++ b/manifests/main/service.pp @@ -6,13 +6,12 @@ class cd_alloy::main::service ( ) inherits cd_alloy::params { - require cd_alloy::main::files service { $ay_service: - ensure => running, - hasstatus => true, - hasrestart => true, - enable => true, + ensure => running, + hasstatus => true, + hasrestart => true, + enable => true, } }