diff --git a/.gitignore b/.gitignore index c49b39a..a356406 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# .gitignore for cd_nagios .yardoc Gemfile.lock FileList +.scannerwork diff --git a/.mdl_style.rb b/.mdl_style.rb new file mode 100644 index 0000000..5d4d3b9 --- /dev/null +++ b/.mdl_style.rb @@ -0,0 +1,3 @@ +all +rule 'MD013', :line_length => 1000 +exclude_rule 'MD036' diff --git a/.mdlrc b/.mdlrc new file mode 100644 index 0000000..e5c563a --- /dev/null +++ b/.mdlrc @@ -0,0 +1,2 @@ +style '.mdl_style.rb' + diff --git a/.spelling b/.spelling new file mode 100644 index 0000000..5b8d112 --- /dev/null +++ b/.spelling @@ -0,0 +1,107 @@ +# 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 +MySQL +mysql +my.conf +cd_mysql +mysqld diff --git a/Gemfile b/Gemfile index e9584ba..49f82d7 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['<= 5.5.6'] gem 'metadata-json-lint', '~> 2.4' gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper', '>= 1.0.0' +gem 'puppetlabs_spec_helper', '~> 3.0' gem 'puppet-lint' gem 'facter' gem 'rspec-puppet' @@ -15,6 +15,7 @@ gem 'rgen' gem 'public_suffix', '<= 2.0.5' gem 'parallel', '<= 1.13.0' gem 'puppet-syntax', '~> 2.6', '>= 2.6.1' +gem 'pathspec', '~> 0.2.1' # rspec must be v2 for ruby 1.8.7 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' diff --git a/Jenkinsfile b/Jenkinsfile index c57b684..9abeb4f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,13 +70,35 @@ pipeline { } } - stage('update repo structure') { + stage('markdown-lint') { steps { - sh '''rm -Rf REPOSTRUCTURE.md - echo "$(tree --dirsfirst --charset=ascii .)" > REPOSTRUCTURE.md''' + sh ''' + source /opt/rh/rh-ruby27/enable + mdl README.md + ''' } } + stage('spell check') { + steps { + sh ''' + mdspell -r -n -a "**/*.md" + ''' + } + } + + stage('SonarScan') { + steps { + sh ''' + /opt/sonar-scanner/bin/sonar-scanner \ + -Dsonar.projectKey=cd_nagios \ + -Dsonar.sources=. \ + -Dsonar.host.url=http://sonarqube.confdroid.com \ + -Dsonar.login=f4d68d1f43370b34439eee7fbf5e2b6182cf449c + ''' + } + } + stage('create Puppet documention') { steps { sh '/opt/puppetlabs/bin/puppet strings'