Drop apache2deb9 variable

All our apaches are stretch at this point.

diff --git a/modules/apache2/templates/puppet-config.erb b/modules/apache2/templates/puppet-config.erb
index b01b5f0..0da1b05 100644 (file)
--- a/modules/apache2/templates/puppet-config.erb
+++ b/modules/apache2/templates/puppet-config.erb
@@ -10,25 +10,23 @@
   #  https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=apache-2.4.25&openssl=1.1.0&hsts=no&profile=intermediate
   SSLCipherSuite          ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
 
-  <%- if has_variable?("apache2deb9") && @apache2deb9 -%>
-    SSLUseStapling On
+  SSLUseStapling On
 
-    # the default size is 32k, but we make it 1M.
-    # | If more than a few SSL certificates are used for the server
-    # |
-    # | OCSP responses are stored in the SSL stapling cache. While the
-    # | responses are typically a few hundred to a few thousand bytes in size,
-    # | mod_ssl supports OCSP responses up to around 10K bytes in size. With more
-    # | than a few certificates, the stapling cache size (32768 bytes in the
-    # | example above) may need to be increased. Error message AH01929 will be
-    # | logged in case of an error storing a response.
-    # [ https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html#ocspstapling ]
+  # the default size is 32k, but we make it 1M.
+  # | If more than a few SSL certificates are used for the server
+  # |
+  # | OCSP responses are stored in the SSL stapling cache. While the
+  # | responses are typically a few hundred to a few thousand bytes in size,
+  # | mod_ssl supports OCSP responses up to around 10K bytes in size. With more
+  # | than a few certificates, the stapling cache size (32768 bytes in the
+  # | example above) may need to be increased. Error message AH01929 will be
+  # | logged in case of an error storing a response.
+  # [ https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html#ocspstapling ]
 
-    SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_stapling(1048576)
-    SSLStaplingReturnResponderErrors off
-    SSLStaplingResponderTimeout 5
-    SSLStaplingFakeTryLater off
-  <% end -%>
+  SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_stapling(1048576)
+  SSLStaplingReturnResponderErrors off
+  SSLStaplingResponderTimeout 5
+  SSLStaplingFakeTryLater off
 </IfModule>
 
 <IfModule mod_autoindex.c>

diff --git a/modules/debian_org/lib/facter/software.rb b/modules/debian_org/lib/facter/software.rb
index 2a55c18..d03fec1 100644 (file)
--- a/modules/debian_org/lib/facter/software.rb
+++ b/modules/debian_org/lib/facter/software.rb
@@ -7,16 +7,6 @@ Facter.add("apache2") do
                end
        end
 end
-Facter.add("apache2deb9") do
-       setcode do
-               # jessie (deb8) has 2.4.10-.., stretch (deb9) will have 2.4.23 or later.
-               if FileTest.exist?("/usr/sbin/apache2") and system("dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' apache2-bin) gt 2.4.15")
-                       true
-               else
-                       false
-               end
-       end
-end
 Facter.add("clamd") do
        setcode do
                if FileTest.exist?("/usr/sbin/clamd")