feat(webserver): apache2 - configurable mod_status

Resolves #259
ajgon · May 6, 2021 · a82335d · a82335d
1 parent 3020734
commit a82335d
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 62 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -2,6 +2,9 @@
 require:
   - rubocop-performance
 
+Gemspec/DateAssignment:
+  Enabled: true
+
 Layout/BeginEndAlignment:
   Enabled: true
 
@@ -15,6 +18,9 @@ Layout/LineLength:
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 
+Layout/SpaceBeforeBrackets:
+  Enabled: false
+
 Lint/AmbiguousAssignment:
   Enabled: true
 
@@ -24,6 +30,9 @@ Lint/BinaryOperatorWithIdenticalOperands:
 Lint/ConstantDefinitionInBlock:
   Enabled: true
 
+Lint/DeprecatedConstants:
+  Enabled: true
+
 Lint/DeprecatedOpenSSLConstant:
   Enabled: true
 
@@ -63,6 +72,9 @@ Lint/HashCompareByIdentity:
 Lint/IdentityComparison:
   Enabled: true
 
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+
 Lint/MissingSuper:
   Enabled: true
 
@@ -72,20 +84,32 @@ Lint/MixedRegexpCaptureTypes:
 Lint/NoReturnInBeginEndBlocks:
   Enabled: true
 
+Lint/NumberedParameterAssignment:
+  Enabled: true
+
+Lint/OrAssignmentToConstant:
+  Enabled: true
+
 Lint/OutOfRangeRegexpRef:
   Enabled: true
 
 Lint/RaiseException:
   Enabled: true
 
+Lint/RedundantDirGlobSort:
+  Enabled: true
+
 Lint/RedundantSafeNavigation:
   Enabled: true
 
 Lint/SelfAssignment:
   Enabled: true
 
-Layout/SpaceBeforeBrackets:
-  Enabled: false
+Lint/SymbolConversion:
+  Enabled: true
+
+Lint/TripleQuotes:
+  Enabled: true
 
 Lint/StructNewOverride:
   Enabled: true
@@ -140,12 +164,21 @@ Performance/CollectionLiteralInLoop:
 Performance/ConstantRegexp:
   Enabled: true
 
+Performance/MapCompact:
+  Enabled: true
+
 Performance/MethodObjectAsBlock:
   Enabled: true
 
+Performance/RedundantEqualityComparisonBlock:
+  Enabled: true
+
 Performance/RedundantSortBlock:
   Enabled: true
 
+Performance/RedundantSplitRegexpArgument:
+  Enabled: true
+
 Performance/RedundantStringChars:
   Enabled: true
 
@@ -194,6 +227,9 @@ Style/DocumentDynamicEvalDefinition:
 Style/Documentation:
   Enabled: false
 
+Style/EndlessMethod:
+  Enabled: true
+
 Style/ExplicitBlockArgument:
   Enabled: true
 
@@ -206,6 +242,9 @@ Style/GlobalStdStream:
 Style/HashAsLastArrayItem:
   Enabled: true
 
+Style/HashConversion:
+  Enabled: false
+
 Style/HashEachMethods:
   Enabled: true
 
@@ -221,6 +260,9 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: false
 
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+
 Style/KeywordParametersOrder:
   Enabled: true
 
@@ -263,6 +305,9 @@ Style/SlicingWithRange:
 Style/SoleNestedConditional:
   Enabled: true
 
+Style/StringChars:
+  Enabled: true
+
 Style/StringConcatenation:
   Enabled: true
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     bcrypt_pbkdf (1.1.0)
     berkshelf (6.3.4)
       buff-config (~> 2.0)
@@ -21,7 +21,7 @@ GEM
       ridley (~> 5.0)
       solve (~> 4.0)
       thor (~> 0.19, < 0.19.2)
-    brakeman (4.10.1)
+    brakeman (5.0.1)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
       varia_model (~> 0.6)
@@ -73,6 +73,8 @@ GEM
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
+    chef-utils (17.0.242)
+      concurrent-ruby
     chef-zero (5.3.2)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -86,7 +88,7 @@ GEM
     childprocess (4.0.0)
     cleanroom (1.0.0)
     colorize (0.8.1)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     coveralls (0.8.19)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
@@ -98,16 +100,16 @@ GEM
     ed25519 (1.2.4)
     erubi (1.10.0)
     erubis (2.7.0)
-    faraday (0.17.3)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    fasterer (0.8.3)
+    fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
     fauxhai (4.1.0)
       net-ssh
-    ffi (1.14.2)
-    ffi-yajl (2.3.4)
-      libyajl2 (~> 1.2)
+    ffi (1.15.0)
+    ffi-yajl (2.4.0)
+      libyajl2 (>= 1.2)
     foodcritic (16.3.0)
       erubis
       ffi-yajl (~> 2.0)
@@ -129,9 +131,9 @@ GEM
     json (2.5.1)
     kitchen-docker (2.10.0)
       test-kitchen (>= 1.0.0)
-    kitchen-vagrant (1.7.2)
+    kitchen-vagrant (1.8.0)
       test-kitchen (>= 1.4, < 3)
-    libyajl2 (1.2.0)
+    libyajl2 (2.1.0)
     license-acceptance (2.1.13)
       pastel (~> 0.7)
       tomlrb (>= 1.2, < 3.0)
@@ -141,15 +143,15 @@ GEM
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.5.1)
     minitar (0.9)
     mixlib-archive (0.4.20)
       mixlib-log
     mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.18)
       tomlrb
-    mixlib-install (3.12.5)
+    mixlib-install (3.12.11)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -170,12 +172,12 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    nio4r (2.5.4)
-    nokogiri (1.11.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     nori (2.6.0)
-    octokit (4.20.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (8.26.1)
@@ -194,7 +196,7 @@ GEM
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
@@ -206,9 +208,9 @@ GEM
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.3)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     retryable (2.0.4)
-    rexml (3.2.4)
+    rexml (3.2.5)
     ridley (5.1.1)
       addressable
       buff-config (~> 2.0)
@@ -239,31 +241,31 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.7.0)
+    rubocop (1.13.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.2)
-      rubocop (>= 0.90.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.1)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.15.0)
+    ruby_parser (3.15.1)
       sexp_processor (~> 4.9)
-    rubyntlm (0.6.2)
+    rubyntlm (0.6.3)
     rubyzip (2.3.0)
     rufus-lru (1.1.0)
     sawyer (0.8.2)
@@ -275,7 +277,7 @@ GEM
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.72)
-    sexp_processor (4.15.1)
+    sexp_processor (4.15.2)
     sfl (2.3)
     simplecov (0.12.0)
       docile (~> 1.1.0)
@@ -285,23 +287,24 @@ GEM
     solve (4.0.4)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    specinfra (2.82.22)
+    specinfra (2.82.25)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
-    strings (0.2.0)
+    strings (0.2.1)
       strings-ansi (~> 0.2)
-      unicode-display_width (~> 1.5)
+      unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     sync (0.5.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-kitchen (2.9.0)
+    test-kitchen (2.11.2)
       bcrypt_pbkdf (~> 1.0)
+      chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
       mixlib-install (~> 3.6)
@@ -316,7 +319,7 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    tins (1.26.0)
+    tins (1.28.0)
       sync
     tomlrb (2.0.1)
     treetop (1.6.11)
@@ -327,29 +330,29 @@ GEM
       tty-cursor (~> 0.7)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.23.0)
+    tty-prompt (0.23.1)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
     tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
     tty-screen (0.8.1)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
-    winrm (2.3.5)
+    winrm (2.3.6)
       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
     winrm-elevated (1.2.3)
       erubi (~> 1.8)
       winrm (~> 2.0)

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -128,6 +128,7 @@
 default['defaults']['webserver']['limit_request_body'] = '1048576'
 default['defaults']['webserver']['proxy_timeout'] = '60'
 default['defaults']['webserver']['use_apache2_ppa'] = (node['platform'] == 'ubuntu')
+default['defaults']['webserver']['enable_status'] = true
 
 ## nginx