From 09c20003d8a5c62268abff35a503234517328098 Mon Sep 17 00:00:00 2001 From: eostre Date: Fri, 16 Oct 2020 15:10:35 -0400 Subject: [PATCH] backing up shopserver1p apache config --- .../{shopserver => }/apache2/apache2.conf | 8 +- .../apache2/conf-available/charset.conf | 0 .../conf-available/drupal-fix-404s.conf | 4 + .../conf-available/localized-error-pages.conf | 0 .../other-vhosts-access-log.conf | 0 .../apache2/conf-available/php7.2-fpm.conf | 23 ++ .../apache2/conf-available/security.conf | 3 +- .../apache2/conf-available/serve-cgi-bin.conf | 0 .../apache2/conf-enabled/charset.conf | 0 .../apache2/conf-enabled/drupal-fix-404s.conf | 4 + .../conf-enabled/localized-error-pages.conf | 0 .../conf-enabled/other-vhosts-access-log.conf | 0 .../apache2/conf-enabled/php7.2-fpm.conf | 23 ++ .../apache2/conf-enabled/security.conf | 3 +- .../apache2/conf-enabled/serve-cgi-bin.conf | 0 drupal-configs/apache2/conf-enabled/ssl.conf | 25 ++ .../{shopserver => }/apache2/envvars | 2 +- drupal-configs/{shopserver => }/apache2/magic | 0 .../apache2/mods-available/access_compat.load | 0 .../apache2/mods-available/actions.conf | 0 .../apache2/mods-available/actions.load | 0 .../apache2/mods-available/alias.conf | 0 .../apache2/mods-available/alias.load | 0 .../apache2/mods-available/allowmethods.load | 0 .../apache2/mods-available/asis.load | 0 .../apache2/mods-available/auth_basic.load | 0 .../apache2/mods-available/auth_digest.load | 0 .../apache2/mods-available/auth_form.load | 0 .../apache2/mods-available/authn_anon.load | 0 .../apache2/mods-available/authn_core.load | 0 .../apache2/mods-available/authn_dbd.load | 0 .../apache2/mods-available/authn_dbm.load | 0 .../apache2/mods-available/authn_file.load | 0 .../apache2/mods-available/authn_socache.load | 0 .../apache2/mods-available/authnz_fcgi.load | 1 + .../apache2/mods-available/authnz_ldap.load | 0 .../apache2/mods-available/authz_core.load | 0 .../apache2/mods-available/authz_dbd.load | 0 .../apache2/mods-available/authz_dbm.load | 0 .../mods-available/authz_groupfile.load | 0 .../apache2/mods-available/authz_host.load | 0 .../apache2/mods-available/authz_owner.load | 0 .../apache2/mods-available/authz_user.load | 0 .../apache2/mods-available/autoindex.conf | 0 .../apache2/mods-available/autoindex.load | 0 .../apache2/mods-available/buffer.load | 0 .../apache2/mods-available/cache.load | 0 .../apache2/mods-available/cache_disk.conf | 0 .../apache2/mods-available/cache_disk.load | 0 .../apache2/mods-available/cache_socache.load | 0 .../apache2/mods-available/cern_meta.load | 1 + .../apache2/mods-available/cgi.load | 0 .../apache2/mods-available/cgid.conf | 0 .../apache2/mods-available/cgid.load | 0 .../apache2/mods-available/charset_lite.load | 0 .../apache2/mods-available/data.load | 0 .../apache2/mods-available/dav.load | 0 .../apache2/mods-available/dav_fs.conf | 0 .../apache2/mods-available/dav_fs.load | 0 .../apache2/mods-available/dav_lock.load | 0 .../apache2/mods-available/dbd.load | 0 .../apache2/mods-available/deflate.conf | 9 +- .../apache2/mods-available/deflate.load | 0 .../apache2/mods-available/dialup.load | 0 .../apache2/mods-available/dir.conf | 0 .../apache2/mods-available/dir.load | 0 .../apache2/mods-available/dump_io.load | 0 .../apache2/mods-available/echo.load | 0 .../apache2/mods-available/env.load | 0 .../apache2/mods-available/expires.load | 0 .../apache2/mods-available/ext_filter.load | 0 .../apache2/mods-available/fcgid.conf | 7 + .../apache2/mods-available/fcgid.load | 1 + .../apache2/mods-available/file_cache.load | 0 .../apache2/mods-available/filter.load | 0 .../apache2/mods-available/headers.load | 0 .../apache2/mods-available/heartbeat.load | 0 .../apache2/mods-available/heartmonitor.load | 0 .../apache2/mods-available/http2.load | 1 + .../apache2/mods-available/ident.load | 1 + .../apache2/mods-available/imagemap.load | 1 + .../apache2/mods-available/include.load | 0 .../apache2/mods-available/info.conf | 0 .../apache2/mods-available/info.load | 0 .../mods-available/lbmethod_bybusyness.load | 0 .../mods-available/lbmethod_byrequests.load | 0 .../mods-available/lbmethod_bytraffic.load | 0 .../mods-available/lbmethod_heartbeat.load | 0 .../apache2/mods-available/ldap.conf | 0 .../apache2/mods-available/ldap.load | 0 .../apache2/mods-available/log_debug.load | 0 .../apache2/mods-available/log_forensic.load | 0 .../apache2/mods-available/lua.load | 0 .../apache2/mods-available/macro.load | 0 .../apache2/mods-available/mime.conf | 2 + .../apache2/mods-available/mime.load | 0 .../apache2/mods-available/mime_magic.conf | 0 .../apache2/mods-available/mime_magic.load | 0 .../apache2/mods-available/mpm_event.conf | 0 .../apache2/mods-available/mpm_event.load | 0 .../apache2/mods-available/mpm_prefork.conf | 16 + .../apache2/mods-available/mpm_prefork.load | 0 .../apache2/mods-available/mpm_worker.conf | 0 .../apache2/mods-available/mpm_worker.load | 0 .../apache2/mods-available/negotiation.conf | 0 .../apache2/mods-available/negotiation.load | 0 .../mods-available/php7.2.conf} | 10 +- .../apache2/mods-available/php7.2.load | 3 + .../apache2/mods-available/proxy.conf | 0 .../apache2/mods-available/proxy.load | 0 .../apache2/mods-available/proxy_ajp.load | 0 .../mods-available/proxy_balancer.conf | 0 .../mods-available/proxy_balancer.load | 0 .../apache2/mods-available/proxy_connect.load | 0 .../apache2/mods-available/proxy_express.load | 0 .../apache2/mods-available/proxy_fcgi.load | 0 .../apache2/mods-available/proxy_fdpass.load | 0 .../apache2/mods-available/proxy_ftp.conf | 0 .../apache2/mods-available/proxy_ftp.load | 0 .../apache2/mods-available/proxy_hcheck.load | 2 + .../apache2/mods-available/proxy_html.conf | 75 +++++ .../apache2/mods-available/proxy_html.load | 2 +- .../apache2/mods-available/proxy_http.load | 0 .../apache2/mods-available/proxy_http2.load | 2 + .../apache2/mods-available/proxy_scgi.load | 0 .../mods-available/proxy_wstunnel.load | 0 .../apache2/mods-available/ratelimit.load | 0 .../apache2/mods-available/reflector.load | 0 .../apache2/mods-available/remoteip.load | 0 .../apache2/mods-available/reqtimeout.conf | 0 .../apache2/mods-available/reqtimeout.load | 0 .../apache2/mods-available/request.load | 0 .../apache2/mods-available/rewrite.load | 0 .../apache2/mods-available/sed.load | 0 .../apache2/mods-available/session.load | 0 .../mods-available/session_cookie.load | 0 .../mods-available/session_crypto.load | 0 .../apache2/mods-available/session_dbd.load | 0 .../apache2/mods-available/setenvif.conf | 0 .../apache2/mods-available/setenvif.load | 0 .../apache2/mods-available/slotmem_plain.load | 0 .../apache2/mods-available/slotmem_shm.load | 0 .../apache2/mods-available/socache_dbm.load | 0 .../mods-available/socache_memcache.load | 0 .../apache2/mods-available/socache_shmcb.load | 0 .../apache2/mods-available/speling.load | 0 .../mods-available/ssl.conf} | 24 +- .../apache2/mods-available/ssl.load | 0 .../apache2/mods-available/status.conf | 0 .../apache2/mods-available/status.load | 0 .../apache2/mods-available/substitute.load | 0 .../apache2/mods-available/suexec.load | 0 .../apache2/mods-available/unique_id.load | 0 .../apache2/mods-available/userdir.conf | 7 +- .../apache2/mods-available/userdir.load | 0 .../apache2/mods-available/usertrack.load | 0 .../apache2/mods-available/vhost_alias.load | 0 .../apache2/mods-available/xml2enc.load | 0 .../apache2/mods-enabled/access_compat.load | 0 .../apache2/mods-enabled/alias.conf | 0 .../apache2/mods-enabled/alias.load | 0 .../apache2/mods-enabled/auth_basic.load | 0 .../apache2/mods-enabled/authn_core.load | 0 .../apache2/mods-enabled/authn_file.load | 0 .../apache2/mods-enabled/authz_core.load | 0 .../apache2/mods-enabled/authz_host.load | 0 .../apache2/mods-enabled/authz_user.load | 0 .../apache2/mods-enabled/autoindex.conf | 0 .../apache2/mods-enabled/autoindex.load | 0 .../apache2/mods-enabled/deflate.conf | 10 + .../apache2/mods-enabled/deflate.load | 2 + .../apache2/mods-enabled/dir.conf | 0 .../apache2/mods-enabled/dir.load | 0 .../apache2/mods-enabled/env.load | 0 .../apache2/mods-enabled/expires.load | 1 + .../apache2/mods-enabled/fcgid.conf | 7 + .../apache2/mods-enabled/fcgid.load | 1 + .../apache2/mods-enabled/filter.load | 0 .../apache2/mods-enabled/headers.load | 0 .../apache2/mods-enabled/mime.conf | 2 + .../apache2/mods-enabled/mime.load | 0 .../apache2/mods-enabled/mpm_prefork.conf | 16 + .../apache2/mods-enabled/mpm_prefork.load | 0 .../apache2/mods-enabled/negotiation.conf | 0 .../apache2/mods-enabled/negotiation.load | 0 .../mods-enabled/php7.2.conf} | 10 +- .../apache2/mods-enabled/php7.2.load | 3 + .../apache2/mods-enabled/proxy.conf | 27 ++ .../apache2/mods-enabled/proxy.load | 1 + .../apache2/mods-enabled/proxy_fcgi.load | 2 + .../apache2/mods-enabled/reqtimeout.conf | 27 ++ .../apache2/mods-enabled/reqtimeout.load | 1 + .../apache2/mods-enabled/rewrite.load | 0 .../apache2/mods-enabled/setenvif.conf | 0 .../apache2/mods-enabled/setenvif.load | 0 .../apache2/mods-enabled/socache_shmcb.load | 0 .../apache2/mods-enabled/ssl.conf | 25 +- .../apache2/mods-enabled/ssl.load | 0 .../apache2/mods-enabled/status.conf | 0 .../apache2/mods-enabled/status.load | 0 .../{shopserver => }/apache2/ports.conf | 0 .../apache2/sites-available/000-default.conf | 6 + .../apache2/sites-available/default-ssl.conf | 8 +- .../shopserver1p.fsf.org-ssl.conf | 36 ++ .../sites-available/shopserver1p.fsf.org.conf | 16 + .../sites-enabled/000-default.conf} | 17 +- .../shopserver1p.fsf.org-ssl.conf | 36 ++ .../shopserver/apache2/conf-enabled/ssl.conf | 7 - .../apache2/mods-available/mpm_prefork.conf | 20 -- .../apache2/mods-available/php5.load | 1 - .../apache2/mods-available/ssl.conf | 90 ----- .../apache2/mods-enabled/mpm_prefork.conf | 20 -- .../shopserver/apache2/mods-enabled/php5.load | 1 - .../sites-available/gnupress.org-common | 13 - .../apache2/sites-available/gnupress.org.conf | 39 --- .../sites-available/shop.fsf.org-common | 283 ---------------- .../sites-available/shop.fsf.org-common~ | 81 ----- .../sites-available/shopserver0p.fsf.org.conf | 74 ----- .../shopserver0p.fsf.org.conf~ | 55 ---- .../apache2/sites-available/ssl-common.conf | 24 -- .../sites-available/ssl-common.conf.cfsaved | 25 -- .../01-shopserver0p.fsf.org.conf | 76 ----- .../sites-enabled/02-gnupress.org.conf | 39 --- drupal-configs/shopserver/conf | 308 ------------------ .../01-shopserver0p.fsf.org.conf | 76 ----- .../sites-enabled/02-gnupress.org.conf | 39 --- 226 files changed, 438 insertions(+), 1347 deletions(-) rename drupal-configs/{shopserver => }/apache2/apache2.conf (97%) rename drupal-configs/{shopserver => }/apache2/conf-available/charset.conf (100%) create mode 100755 drupal-configs/apache2/conf-available/drupal-fix-404s.conf rename drupal-configs/{shopserver => }/apache2/conf-available/localized-error-pages.conf (100%) rename drupal-configs/{shopserver => }/apache2/conf-available/other-vhosts-access-log.conf (100%) create mode 100644 drupal-configs/apache2/conf-available/php7.2-fpm.conf rename drupal-configs/{shopserver => }/apache2/conf-available/security.conf (98%) rename drupal-configs/{shopserver => }/apache2/conf-available/serve-cgi-bin.conf (100%) rename drupal-configs/{shopserver => }/apache2/conf-enabled/charset.conf (100%) create mode 100755 drupal-configs/apache2/conf-enabled/drupal-fix-404s.conf rename drupal-configs/{shopserver => }/apache2/conf-enabled/localized-error-pages.conf (100%) rename drupal-configs/{shopserver => }/apache2/conf-enabled/other-vhosts-access-log.conf (100%) create mode 100644 drupal-configs/apache2/conf-enabled/php7.2-fpm.conf rename drupal-configs/{shopserver => }/apache2/conf-enabled/security.conf (98%) rename drupal-configs/{shopserver => }/apache2/conf-enabled/serve-cgi-bin.conf (100%) create mode 100644 drupal-configs/apache2/conf-enabled/ssl.conf rename drupal-configs/{shopserver => }/apache2/envvars (96%) rename drupal-configs/{shopserver => }/apache2/magic (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/access_compat.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/actions.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/actions.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/alias.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/alias.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/allowmethods.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/asis.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/auth_basic.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/auth_digest.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/auth_form.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authn_anon.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authn_core.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authn_dbd.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authn_dbm.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authn_file.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authn_socache.load (100%) create mode 100644 drupal-configs/apache2/mods-available/authnz_fcgi.load rename drupal-configs/{shopserver => }/apache2/mods-available/authnz_ldap.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authz_core.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authz_dbd.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authz_dbm.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authz_groupfile.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authz_host.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authz_owner.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/authz_user.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/autoindex.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/autoindex.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/buffer.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/cache.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/cache_disk.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/cache_disk.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/cache_socache.load (100%) create mode 100644 drupal-configs/apache2/mods-available/cern_meta.load rename drupal-configs/{shopserver => }/apache2/mods-available/cgi.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/cgid.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/cgid.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/charset_lite.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/data.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dav.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dav_fs.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dav_fs.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dav_lock.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dbd.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/deflate.conf (52%) rename drupal-configs/{shopserver => }/apache2/mods-available/deflate.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dialup.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dir.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dir.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/dump_io.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/echo.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/env.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/expires.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/ext_filter.load (100%) create mode 100644 drupal-configs/apache2/mods-available/fcgid.conf create mode 100644 drupal-configs/apache2/mods-available/fcgid.load rename drupal-configs/{shopserver => }/apache2/mods-available/file_cache.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/filter.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/headers.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/heartbeat.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/heartmonitor.load (100%) create mode 100644 drupal-configs/apache2/mods-available/http2.load create mode 100644 drupal-configs/apache2/mods-available/ident.load create mode 100644 drupal-configs/apache2/mods-available/imagemap.load rename drupal-configs/{shopserver => }/apache2/mods-available/include.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/info.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/info.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/lbmethod_bybusyness.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/lbmethod_byrequests.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/lbmethod_bytraffic.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/lbmethod_heartbeat.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/ldap.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/ldap.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/log_debug.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/log_forensic.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/lua.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/macro.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/mime.conf (99%) rename drupal-configs/{shopserver => }/apache2/mods-available/mime.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/mime_magic.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/mime_magic.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/mpm_event.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/mpm_event.load (100%) create mode 100644 drupal-configs/apache2/mods-available/mpm_prefork.conf rename drupal-configs/{shopserver => }/apache2/mods-available/mpm_prefork.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/mpm_worker.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/mpm_worker.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/negotiation.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/negotiation.load (100%) rename drupal-configs/{shopserver/apache2/mods-available/php5.conf => apache2/mods-available/php7.2.conf} (82%) create mode 100644 drupal-configs/apache2/mods-available/php7.2.load rename drupal-configs/{shopserver => }/apache2/mods-available/proxy.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_ajp.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_balancer.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_balancer.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_connect.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_express.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_fcgi.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_fdpass.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_ftp.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_ftp.load (100%) create mode 100644 drupal-configs/apache2/mods-available/proxy_hcheck.load create mode 100644 drupal-configs/apache2/mods-available/proxy_html.conf rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_html.load (74%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_http.load (100%) create mode 100644 drupal-configs/apache2/mods-available/proxy_http2.load rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_scgi.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/proxy_wstunnel.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/ratelimit.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/reflector.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/remoteip.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/reqtimeout.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/reqtimeout.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/request.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/rewrite.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/sed.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/session.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/session_cookie.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/session_crypto.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/session_dbd.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/setenvif.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/setenvif.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/slotmem_plain.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/slotmem_shm.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/socache_dbm.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/socache_memcache.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/socache_shmcb.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/speling.load (100%) rename drupal-configs/{shopserver/apache2/mods-available/ssl.conf_1467135174_Tue_Jun_28_13_32_54_2016_.cfsaved => apache2/mods-available/ssl.conf} (77%) rename drupal-configs/{shopserver => }/apache2/mods-available/ssl.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/status.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/status.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/substitute.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/suexec.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/unique_id.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/userdir.conf (68%) rename drupal-configs/{shopserver => }/apache2/mods-available/userdir.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/usertrack.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/vhost_alias.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-available/xml2enc.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/access_compat.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/alias.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/alias.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/auth_basic.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/authn_core.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/authn_file.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/authz_core.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/authz_host.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/authz_user.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/autoindex.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/autoindex.load (100%) create mode 100644 drupal-configs/apache2/mods-enabled/deflate.conf create mode 100644 drupal-configs/apache2/mods-enabled/deflate.load rename drupal-configs/{shopserver => }/apache2/mods-enabled/dir.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/dir.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/env.load (100%) create mode 100644 drupal-configs/apache2/mods-enabled/expires.load create mode 100644 drupal-configs/apache2/mods-enabled/fcgid.conf create mode 100644 drupal-configs/apache2/mods-enabled/fcgid.load rename drupal-configs/{shopserver => }/apache2/mods-enabled/filter.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/headers.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/mime.conf (99%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/mime.load (100%) create mode 100644 drupal-configs/apache2/mods-enabled/mpm_prefork.conf rename drupal-configs/{shopserver => }/apache2/mods-enabled/mpm_prefork.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/negotiation.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/negotiation.load (100%) rename drupal-configs/{shopserver/apache2/mods-enabled/php5.conf => apache2/mods-enabled/php7.2.conf} (82%) create mode 100644 drupal-configs/apache2/mods-enabled/php7.2.load create mode 100644 drupal-configs/apache2/mods-enabled/proxy.conf create mode 100644 drupal-configs/apache2/mods-enabled/proxy.load create mode 100644 drupal-configs/apache2/mods-enabled/proxy_fcgi.load create mode 100644 drupal-configs/apache2/mods-enabled/reqtimeout.conf create mode 100644 drupal-configs/apache2/mods-enabled/reqtimeout.load rename drupal-configs/{shopserver => }/apache2/mods-enabled/rewrite.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/setenvif.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/setenvif.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/socache_shmcb.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/ssl.conf (76%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/ssl.load (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/status.conf (100%) rename drupal-configs/{shopserver => }/apache2/mods-enabled/status.load (100%) rename drupal-configs/{shopserver => }/apache2/ports.conf (100%) rename drupal-configs/{shopserver => }/apache2/sites-available/000-default.conf (87%) rename drupal-configs/{shopserver => }/apache2/sites-available/default-ssl.conf (96%) create mode 100644 drupal-configs/apache2/sites-available/shopserver1p.fsf.org-ssl.conf create mode 100644 drupal-configs/apache2/sites-available/shopserver1p.fsf.org.conf rename drupal-configs/{shopserver/apache2/sites-available/000-default-le-ssl.conf => apache2/sites-enabled/000-default.conf} (76%) create mode 100644 drupal-configs/apache2/sites-enabled/shopserver1p.fsf.org-ssl.conf delete mode 100644 drupal-configs/shopserver/apache2/conf-enabled/ssl.conf delete mode 100644 drupal-configs/shopserver/apache2/mods-available/mpm_prefork.conf delete mode 100644 drupal-configs/shopserver/apache2/mods-available/php5.load delete mode 100644 drupal-configs/shopserver/apache2/mods-available/ssl.conf delete mode 100644 drupal-configs/shopserver/apache2/mods-enabled/mpm_prefork.conf delete mode 100644 drupal-configs/shopserver/apache2/mods-enabled/php5.load delete mode 100644 drupal-configs/shopserver/apache2/sites-available/gnupress.org-common delete mode 100644 drupal-configs/shopserver/apache2/sites-available/gnupress.org.conf delete mode 100644 drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common delete mode 100644 drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common~ delete mode 100644 drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf delete mode 100644 drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf~ delete mode 100644 drupal-configs/shopserver/apache2/sites-available/ssl-common.conf delete mode 100644 drupal-configs/shopserver/apache2/sites-available/ssl-common.conf.cfsaved delete mode 100644 drupal-configs/shopserver/apache2/sites-enabled/01-shopserver0p.fsf.org.conf delete mode 100644 drupal-configs/shopserver/apache2/sites-enabled/02-gnupress.org.conf delete mode 100644 drupal-configs/shopserver/conf delete mode 100644 drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf delete mode 100644 drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf diff --git a/drupal-configs/shopserver/apache2/apache2.conf b/drupal-configs/apache2/apache2.conf similarity index 97% rename from drupal-configs/shopserver/apache2/apache2.conf rename to drupal-configs/apache2/apache2.conf index baf6d8a..ae4b2c3 100644 --- a/drupal-configs/shopserver/apache2/apache2.conf +++ b/drupal-configs/apache2/apache2.conf @@ -71,7 +71,13 @@ # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. # -Mutex file:${APACHE_LOCK_DIR} default +#Mutex file:${APACHE_LOCK_DIR} default + +# +# The directory where shm and other runtime files will be stored. +# + +DefaultRuntimeDir ${APACHE_RUN_DIR} # # PidFile: The file in which the server should record its process diff --git a/drupal-configs/shopserver/apache2/conf-available/charset.conf b/drupal-configs/apache2/conf-available/charset.conf similarity index 100% rename from drupal-configs/shopserver/apache2/conf-available/charset.conf rename to drupal-configs/apache2/conf-available/charset.conf diff --git a/drupal-configs/apache2/conf-available/drupal-fix-404s.conf b/drupal-configs/apache2/conf-available/drupal-fix-404s.conf new file mode 100755 index 0000000..a17eb05 --- /dev/null +++ b/drupal-configs/apache2/conf-available/drupal-fix-404s.conf @@ -0,0 +1,4 @@ +# do this so that .htaccess can cause things to not 404 + + AllowOverride All + diff --git a/drupal-configs/shopserver/apache2/conf-available/localized-error-pages.conf b/drupal-configs/apache2/conf-available/localized-error-pages.conf similarity index 100% rename from drupal-configs/shopserver/apache2/conf-available/localized-error-pages.conf rename to drupal-configs/apache2/conf-available/localized-error-pages.conf diff --git a/drupal-configs/shopserver/apache2/conf-available/other-vhosts-access-log.conf b/drupal-configs/apache2/conf-available/other-vhosts-access-log.conf similarity index 100% rename from drupal-configs/shopserver/apache2/conf-available/other-vhosts-access-log.conf rename to drupal-configs/apache2/conf-available/other-vhosts-access-log.conf diff --git a/drupal-configs/apache2/conf-available/php7.2-fpm.conf b/drupal-configs/apache2/conf-available/php7.2-fpm.conf new file mode 100644 index 0000000..d15343f --- /dev/null +++ b/drupal-configs/apache2/conf-available/php7.2-fpm.conf @@ -0,0 +1,23 @@ +# Redirect to local php-fpm if mod_php is not available + + + # Enable http authorization headers + + SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 + + + + SetHandler "proxy:unix:/run/php/php7.2-fpm.sock|fcgi://localhost" + + + # Deny access to raw php sources by default + # To re-enable it's recommended to enable access to the files + # only in specific virtual host or directory + Require all denied + + # Deny access to files without filename (e.g. '.php') + + Require all denied + + + diff --git a/drupal-configs/shopserver/apache2/conf-available/security.conf b/drupal-configs/apache2/conf-available/security.conf similarity index 98% rename from drupal-configs/shopserver/apache2/conf-available/security.conf rename to drupal-configs/apache2/conf-available/security.conf index 599333b..f9f69d4 100644 --- a/drupal-configs/shopserver/apache2/conf-available/security.conf +++ b/drupal-configs/apache2/conf-available/security.conf @@ -7,8 +7,7 @@ # # # AllowOverride None -# Order Deny,Allow -# Deny from all +# Require all denied # diff --git a/drupal-configs/shopserver/apache2/conf-available/serve-cgi-bin.conf b/drupal-configs/apache2/conf-available/serve-cgi-bin.conf similarity index 100% rename from drupal-configs/shopserver/apache2/conf-available/serve-cgi-bin.conf rename to drupal-configs/apache2/conf-available/serve-cgi-bin.conf diff --git a/drupal-configs/shopserver/apache2/conf-enabled/charset.conf b/drupal-configs/apache2/conf-enabled/charset.conf similarity index 100% rename from drupal-configs/shopserver/apache2/conf-enabled/charset.conf rename to drupal-configs/apache2/conf-enabled/charset.conf diff --git a/drupal-configs/apache2/conf-enabled/drupal-fix-404s.conf b/drupal-configs/apache2/conf-enabled/drupal-fix-404s.conf new file mode 100755 index 0000000..a17eb05 --- /dev/null +++ b/drupal-configs/apache2/conf-enabled/drupal-fix-404s.conf @@ -0,0 +1,4 @@ +# do this so that .htaccess can cause things to not 404 + + AllowOverride All + diff --git a/drupal-configs/shopserver/apache2/conf-enabled/localized-error-pages.conf b/drupal-configs/apache2/conf-enabled/localized-error-pages.conf similarity index 100% rename from drupal-configs/shopserver/apache2/conf-enabled/localized-error-pages.conf rename to drupal-configs/apache2/conf-enabled/localized-error-pages.conf diff --git a/drupal-configs/shopserver/apache2/conf-enabled/other-vhosts-access-log.conf b/drupal-configs/apache2/conf-enabled/other-vhosts-access-log.conf similarity index 100% rename from drupal-configs/shopserver/apache2/conf-enabled/other-vhosts-access-log.conf rename to drupal-configs/apache2/conf-enabled/other-vhosts-access-log.conf diff --git a/drupal-configs/apache2/conf-enabled/php7.2-fpm.conf b/drupal-configs/apache2/conf-enabled/php7.2-fpm.conf new file mode 100644 index 0000000..d15343f --- /dev/null +++ b/drupal-configs/apache2/conf-enabled/php7.2-fpm.conf @@ -0,0 +1,23 @@ +# Redirect to local php-fpm if mod_php is not available + + + # Enable http authorization headers + + SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 + + + + SetHandler "proxy:unix:/run/php/php7.2-fpm.sock|fcgi://localhost" + + + # Deny access to raw php sources by default + # To re-enable it's recommended to enable access to the files + # only in specific virtual host or directory + Require all denied + + # Deny access to files without filename (e.g. '.php') + + Require all denied + + + diff --git a/drupal-configs/shopserver/apache2/conf-enabled/security.conf b/drupal-configs/apache2/conf-enabled/security.conf similarity index 98% rename from drupal-configs/shopserver/apache2/conf-enabled/security.conf rename to drupal-configs/apache2/conf-enabled/security.conf index 599333b..f9f69d4 100644 --- a/drupal-configs/shopserver/apache2/conf-enabled/security.conf +++ b/drupal-configs/apache2/conf-enabled/security.conf @@ -7,8 +7,7 @@ # # # AllowOverride None -# Order Deny,Allow -# Deny from all +# Require all denied # diff --git a/drupal-configs/shopserver/apache2/conf-enabled/serve-cgi-bin.conf b/drupal-configs/apache2/conf-enabled/serve-cgi-bin.conf similarity index 100% rename from drupal-configs/shopserver/apache2/conf-enabled/serve-cgi-bin.conf rename to drupal-configs/apache2/conf-enabled/serve-cgi-bin.conf diff --git a/drupal-configs/apache2/conf-enabled/ssl.conf b/drupal-configs/apache2/conf-enabled/ssl.conf new file mode 100644 index 0000000..89583b9 --- /dev/null +++ b/drupal-configs/apache2/conf-enabled/ssl.conf @@ -0,0 +1,25 @@ +# File managed by ansible, do not edit +#https://cipherli.st/ + +SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH +SSLProtocol All -SSLv2 -SSLv3 -TLSv1 -TLSv1.1 +SSLHonorCipherOrder On +Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" +Header always set X-Frame-Options sameorigin +Header always set X-Content-Type-Options nosniff +# Requires Apache >= 2.4 +SSLCompression off + +#SSLUseStapling on +#SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_stapling_cache(128000) +#SSLStaplingResponderTimeout 5 +#SSLStaplingFakeTryLater off +#SSLStaplingReturnResponderErrors off +#SSLStaplingForceURL http://serverproxy0p.fsf.org:8001 + +# Requires Apache >= 2.4.11 +SSLSessionTickets Off + +# https://weakdh.org/sysadmin.html +# Requires Apache >= 2.4.8 +SSLOpenSSLConfCmd DHParameters "/etc/ssl/private/dhparams.pem" diff --git a/drupal-configs/shopserver/apache2/envvars b/drupal-configs/apache2/envvars similarity index 96% rename from drupal-configs/shopserver/apache2/envvars rename to drupal-configs/apache2/envvars index 91328ac..708d170 100644 --- a/drupal-configs/shopserver/apache2/envvars +++ b/drupal-configs/apache2/envvars @@ -16,7 +16,7 @@ fi export APACHE_RUN_USER=www-data export APACHE_RUN_GROUP=www-data # temporary state file location. This might be changed to /run in Wheezy+1 -export APACHE_PID_FILE=/var/run/apache2/apache2$SUFFIX.pid +export APACHE_PID_FILE=/var/run/apache2$SUFFIX/apache2.pid export APACHE_RUN_DIR=/var/run/apache2$SUFFIX export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX # Only /var/log/apache2 is handled by /etc/logrotate.d/apache2. diff --git a/drupal-configs/shopserver/apache2/magic b/drupal-configs/apache2/magic similarity index 100% rename from drupal-configs/shopserver/apache2/magic rename to drupal-configs/apache2/magic diff --git a/drupal-configs/shopserver/apache2/mods-available/access_compat.load b/drupal-configs/apache2/mods-available/access_compat.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/access_compat.load rename to drupal-configs/apache2/mods-available/access_compat.load diff --git a/drupal-configs/shopserver/apache2/mods-available/actions.conf b/drupal-configs/apache2/mods-available/actions.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/actions.conf rename to drupal-configs/apache2/mods-available/actions.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/actions.load b/drupal-configs/apache2/mods-available/actions.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/actions.load rename to drupal-configs/apache2/mods-available/actions.load diff --git a/drupal-configs/shopserver/apache2/mods-available/alias.conf b/drupal-configs/apache2/mods-available/alias.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/alias.conf rename to drupal-configs/apache2/mods-available/alias.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/alias.load b/drupal-configs/apache2/mods-available/alias.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/alias.load rename to drupal-configs/apache2/mods-available/alias.load diff --git a/drupal-configs/shopserver/apache2/mods-available/allowmethods.load b/drupal-configs/apache2/mods-available/allowmethods.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/allowmethods.load rename to drupal-configs/apache2/mods-available/allowmethods.load diff --git a/drupal-configs/shopserver/apache2/mods-available/asis.load b/drupal-configs/apache2/mods-available/asis.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/asis.load rename to drupal-configs/apache2/mods-available/asis.load diff --git a/drupal-configs/shopserver/apache2/mods-available/auth_basic.load b/drupal-configs/apache2/mods-available/auth_basic.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/auth_basic.load rename to drupal-configs/apache2/mods-available/auth_basic.load diff --git a/drupal-configs/shopserver/apache2/mods-available/auth_digest.load b/drupal-configs/apache2/mods-available/auth_digest.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/auth_digest.load rename to drupal-configs/apache2/mods-available/auth_digest.load diff --git a/drupal-configs/shopserver/apache2/mods-available/auth_form.load b/drupal-configs/apache2/mods-available/auth_form.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/auth_form.load rename to drupal-configs/apache2/mods-available/auth_form.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authn_anon.load b/drupal-configs/apache2/mods-available/authn_anon.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authn_anon.load rename to drupal-configs/apache2/mods-available/authn_anon.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authn_core.load b/drupal-configs/apache2/mods-available/authn_core.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authn_core.load rename to drupal-configs/apache2/mods-available/authn_core.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authn_dbd.load b/drupal-configs/apache2/mods-available/authn_dbd.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authn_dbd.load rename to drupal-configs/apache2/mods-available/authn_dbd.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authn_dbm.load b/drupal-configs/apache2/mods-available/authn_dbm.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authn_dbm.load rename to drupal-configs/apache2/mods-available/authn_dbm.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authn_file.load b/drupal-configs/apache2/mods-available/authn_file.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authn_file.load rename to drupal-configs/apache2/mods-available/authn_file.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authn_socache.load b/drupal-configs/apache2/mods-available/authn_socache.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authn_socache.load rename to drupal-configs/apache2/mods-available/authn_socache.load diff --git a/drupal-configs/apache2/mods-available/authnz_fcgi.load b/drupal-configs/apache2/mods-available/authnz_fcgi.load new file mode 100644 index 0000000..69d757c --- /dev/null +++ b/drupal-configs/apache2/mods-available/authnz_fcgi.load @@ -0,0 +1 @@ +LoadModule authnz_fcgi_module /usr/lib/apache2/modules/mod_authnz_fcgi.so diff --git a/drupal-configs/shopserver/apache2/mods-available/authnz_ldap.load b/drupal-configs/apache2/mods-available/authnz_ldap.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authnz_ldap.load rename to drupal-configs/apache2/mods-available/authnz_ldap.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authz_core.load b/drupal-configs/apache2/mods-available/authz_core.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authz_core.load rename to drupal-configs/apache2/mods-available/authz_core.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authz_dbd.load b/drupal-configs/apache2/mods-available/authz_dbd.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authz_dbd.load rename to drupal-configs/apache2/mods-available/authz_dbd.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authz_dbm.load b/drupal-configs/apache2/mods-available/authz_dbm.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authz_dbm.load rename to drupal-configs/apache2/mods-available/authz_dbm.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authz_groupfile.load b/drupal-configs/apache2/mods-available/authz_groupfile.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authz_groupfile.load rename to drupal-configs/apache2/mods-available/authz_groupfile.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authz_host.load b/drupal-configs/apache2/mods-available/authz_host.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authz_host.load rename to drupal-configs/apache2/mods-available/authz_host.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authz_owner.load b/drupal-configs/apache2/mods-available/authz_owner.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authz_owner.load rename to drupal-configs/apache2/mods-available/authz_owner.load diff --git a/drupal-configs/shopserver/apache2/mods-available/authz_user.load b/drupal-configs/apache2/mods-available/authz_user.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/authz_user.load rename to drupal-configs/apache2/mods-available/authz_user.load diff --git a/drupal-configs/shopserver/apache2/mods-available/autoindex.conf b/drupal-configs/apache2/mods-available/autoindex.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/autoindex.conf rename to drupal-configs/apache2/mods-available/autoindex.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/autoindex.load b/drupal-configs/apache2/mods-available/autoindex.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/autoindex.load rename to drupal-configs/apache2/mods-available/autoindex.load diff --git a/drupal-configs/shopserver/apache2/mods-available/buffer.load b/drupal-configs/apache2/mods-available/buffer.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/buffer.load rename to drupal-configs/apache2/mods-available/buffer.load diff --git a/drupal-configs/shopserver/apache2/mods-available/cache.load b/drupal-configs/apache2/mods-available/cache.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/cache.load rename to drupal-configs/apache2/mods-available/cache.load diff --git a/drupal-configs/shopserver/apache2/mods-available/cache_disk.conf b/drupal-configs/apache2/mods-available/cache_disk.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/cache_disk.conf rename to drupal-configs/apache2/mods-available/cache_disk.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/cache_disk.load b/drupal-configs/apache2/mods-available/cache_disk.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/cache_disk.load rename to drupal-configs/apache2/mods-available/cache_disk.load diff --git a/drupal-configs/shopserver/apache2/mods-available/cache_socache.load b/drupal-configs/apache2/mods-available/cache_socache.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/cache_socache.load rename to drupal-configs/apache2/mods-available/cache_socache.load diff --git a/drupal-configs/apache2/mods-available/cern_meta.load b/drupal-configs/apache2/mods-available/cern_meta.load new file mode 100644 index 0000000..bcc7546 --- /dev/null +++ b/drupal-configs/apache2/mods-available/cern_meta.load @@ -0,0 +1 @@ +LoadModule cern_meta_module /usr/lib/apache2/modules/mod_cern_meta.so diff --git a/drupal-configs/shopserver/apache2/mods-available/cgi.load b/drupal-configs/apache2/mods-available/cgi.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/cgi.load rename to drupal-configs/apache2/mods-available/cgi.load diff --git a/drupal-configs/shopserver/apache2/mods-available/cgid.conf b/drupal-configs/apache2/mods-available/cgid.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/cgid.conf rename to drupal-configs/apache2/mods-available/cgid.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/cgid.load b/drupal-configs/apache2/mods-available/cgid.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/cgid.load rename to drupal-configs/apache2/mods-available/cgid.load diff --git a/drupal-configs/shopserver/apache2/mods-available/charset_lite.load b/drupal-configs/apache2/mods-available/charset_lite.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/charset_lite.load rename to drupal-configs/apache2/mods-available/charset_lite.load diff --git a/drupal-configs/shopserver/apache2/mods-available/data.load b/drupal-configs/apache2/mods-available/data.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/data.load rename to drupal-configs/apache2/mods-available/data.load diff --git a/drupal-configs/shopserver/apache2/mods-available/dav.load b/drupal-configs/apache2/mods-available/dav.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dav.load rename to drupal-configs/apache2/mods-available/dav.load diff --git a/drupal-configs/shopserver/apache2/mods-available/dav_fs.conf b/drupal-configs/apache2/mods-available/dav_fs.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dav_fs.conf rename to drupal-configs/apache2/mods-available/dav_fs.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/dav_fs.load b/drupal-configs/apache2/mods-available/dav_fs.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dav_fs.load rename to drupal-configs/apache2/mods-available/dav_fs.load diff --git a/drupal-configs/shopserver/apache2/mods-available/dav_lock.load b/drupal-configs/apache2/mods-available/dav_lock.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dav_lock.load rename to drupal-configs/apache2/mods-available/dav_lock.load diff --git a/drupal-configs/shopserver/apache2/mods-available/dbd.load b/drupal-configs/apache2/mods-available/dbd.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dbd.load rename to drupal-configs/apache2/mods-available/dbd.load diff --git a/drupal-configs/shopserver/apache2/mods-available/deflate.conf b/drupal-configs/apache2/mods-available/deflate.conf similarity index 52% rename from drupal-configs/shopserver/apache2/mods-available/deflate.conf rename to drupal-configs/apache2/mods-available/deflate.conf index 3091ffb..db48f92 100644 --- a/drupal-configs/shopserver/apache2/mods-available/deflate.conf +++ b/drupal-configs/apache2/mods-available/deflate.conf @@ -1,14 +1,9 @@ - # these are known to be safe with MSIE 6 - - #AddOutputFilterByType DEFLATE text/html text/plain text/xml - - # everything else may cause problems with MSIE 6 - AddOutputFilterByType DEFLATE text/css + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript AddOutputFilterByType DEFLATE application/rss+xml - #AddOutputFilterByType DEFLATE application/xml + AddOutputFilterByType DEFLATE application/xml diff --git a/drupal-configs/shopserver/apache2/mods-available/deflate.load b/drupal-configs/apache2/mods-available/deflate.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/deflate.load rename to drupal-configs/apache2/mods-available/deflate.load diff --git a/drupal-configs/shopserver/apache2/mods-available/dialup.load b/drupal-configs/apache2/mods-available/dialup.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dialup.load rename to drupal-configs/apache2/mods-available/dialup.load diff --git a/drupal-configs/shopserver/apache2/mods-available/dir.conf b/drupal-configs/apache2/mods-available/dir.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dir.conf rename to drupal-configs/apache2/mods-available/dir.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/dir.load b/drupal-configs/apache2/mods-available/dir.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dir.load rename to drupal-configs/apache2/mods-available/dir.load diff --git a/drupal-configs/shopserver/apache2/mods-available/dump_io.load b/drupal-configs/apache2/mods-available/dump_io.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/dump_io.load rename to drupal-configs/apache2/mods-available/dump_io.load diff --git a/drupal-configs/shopserver/apache2/mods-available/echo.load b/drupal-configs/apache2/mods-available/echo.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/echo.load rename to drupal-configs/apache2/mods-available/echo.load diff --git a/drupal-configs/shopserver/apache2/mods-available/env.load b/drupal-configs/apache2/mods-available/env.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/env.load rename to drupal-configs/apache2/mods-available/env.load diff --git a/drupal-configs/shopserver/apache2/mods-available/expires.load b/drupal-configs/apache2/mods-available/expires.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/expires.load rename to drupal-configs/apache2/mods-available/expires.load diff --git a/drupal-configs/shopserver/apache2/mods-available/ext_filter.load b/drupal-configs/apache2/mods-available/ext_filter.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/ext_filter.load rename to drupal-configs/apache2/mods-available/ext_filter.load diff --git a/drupal-configs/apache2/mods-available/fcgid.conf b/drupal-configs/apache2/mods-available/fcgid.conf new file mode 100644 index 0000000..ace956d --- /dev/null +++ b/drupal-configs/apache2/mods-available/fcgid.conf @@ -0,0 +1,7 @@ + + FcgidConnectTimeout 20 + + + AddHandler fcgid-script .fcgi + + diff --git a/drupal-configs/apache2/mods-available/fcgid.load b/drupal-configs/apache2/mods-available/fcgid.load new file mode 100644 index 0000000..3c15f74 --- /dev/null +++ b/drupal-configs/apache2/mods-available/fcgid.load @@ -0,0 +1 @@ +LoadModule fcgid_module /usr/lib/apache2/modules/mod_fcgid.so diff --git a/drupal-configs/shopserver/apache2/mods-available/file_cache.load b/drupal-configs/apache2/mods-available/file_cache.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/file_cache.load rename to drupal-configs/apache2/mods-available/file_cache.load diff --git a/drupal-configs/shopserver/apache2/mods-available/filter.load b/drupal-configs/apache2/mods-available/filter.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/filter.load rename to drupal-configs/apache2/mods-available/filter.load diff --git a/drupal-configs/shopserver/apache2/mods-available/headers.load b/drupal-configs/apache2/mods-available/headers.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/headers.load rename to drupal-configs/apache2/mods-available/headers.load diff --git a/drupal-configs/shopserver/apache2/mods-available/heartbeat.load b/drupal-configs/apache2/mods-available/heartbeat.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/heartbeat.load rename to drupal-configs/apache2/mods-available/heartbeat.load diff --git a/drupal-configs/shopserver/apache2/mods-available/heartmonitor.load b/drupal-configs/apache2/mods-available/heartmonitor.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/heartmonitor.load rename to drupal-configs/apache2/mods-available/heartmonitor.load diff --git a/drupal-configs/apache2/mods-available/http2.load b/drupal-configs/apache2/mods-available/http2.load new file mode 100644 index 0000000..e5c769f --- /dev/null +++ b/drupal-configs/apache2/mods-available/http2.load @@ -0,0 +1 @@ +LoadModule http2_module /usr/lib/apache2/modules/mod_http2.so diff --git a/drupal-configs/apache2/mods-available/ident.load b/drupal-configs/apache2/mods-available/ident.load new file mode 100644 index 0000000..f7c4c3c --- /dev/null +++ b/drupal-configs/apache2/mods-available/ident.load @@ -0,0 +1 @@ +LoadModule ident_module /usr/lib/apache2/modules/mod_ident.so diff --git a/drupal-configs/apache2/mods-available/imagemap.load b/drupal-configs/apache2/mods-available/imagemap.load new file mode 100644 index 0000000..0fd55f8 --- /dev/null +++ b/drupal-configs/apache2/mods-available/imagemap.load @@ -0,0 +1 @@ +LoadModule imagemap_module /usr/lib/apache2/modules/mod_imagemap.so diff --git a/drupal-configs/shopserver/apache2/mods-available/include.load b/drupal-configs/apache2/mods-available/include.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/include.load rename to drupal-configs/apache2/mods-available/include.load diff --git a/drupal-configs/shopserver/apache2/mods-available/info.conf b/drupal-configs/apache2/mods-available/info.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/info.conf rename to drupal-configs/apache2/mods-available/info.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/info.load b/drupal-configs/apache2/mods-available/info.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/info.load rename to drupal-configs/apache2/mods-available/info.load diff --git a/drupal-configs/shopserver/apache2/mods-available/lbmethod_bybusyness.load b/drupal-configs/apache2/mods-available/lbmethod_bybusyness.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/lbmethod_bybusyness.load rename to drupal-configs/apache2/mods-available/lbmethod_bybusyness.load diff --git a/drupal-configs/shopserver/apache2/mods-available/lbmethod_byrequests.load b/drupal-configs/apache2/mods-available/lbmethod_byrequests.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/lbmethod_byrequests.load rename to drupal-configs/apache2/mods-available/lbmethod_byrequests.load diff --git a/drupal-configs/shopserver/apache2/mods-available/lbmethod_bytraffic.load b/drupal-configs/apache2/mods-available/lbmethod_bytraffic.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/lbmethod_bytraffic.load rename to drupal-configs/apache2/mods-available/lbmethod_bytraffic.load diff --git a/drupal-configs/shopserver/apache2/mods-available/lbmethod_heartbeat.load b/drupal-configs/apache2/mods-available/lbmethod_heartbeat.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/lbmethod_heartbeat.load rename to drupal-configs/apache2/mods-available/lbmethod_heartbeat.load diff --git a/drupal-configs/shopserver/apache2/mods-available/ldap.conf b/drupal-configs/apache2/mods-available/ldap.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/ldap.conf rename to drupal-configs/apache2/mods-available/ldap.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/ldap.load b/drupal-configs/apache2/mods-available/ldap.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/ldap.load rename to drupal-configs/apache2/mods-available/ldap.load diff --git a/drupal-configs/shopserver/apache2/mods-available/log_debug.load b/drupal-configs/apache2/mods-available/log_debug.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/log_debug.load rename to drupal-configs/apache2/mods-available/log_debug.load diff --git a/drupal-configs/shopserver/apache2/mods-available/log_forensic.load b/drupal-configs/apache2/mods-available/log_forensic.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/log_forensic.load rename to drupal-configs/apache2/mods-available/log_forensic.load diff --git a/drupal-configs/shopserver/apache2/mods-available/lua.load b/drupal-configs/apache2/mods-available/lua.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/lua.load rename to drupal-configs/apache2/mods-available/lua.load diff --git a/drupal-configs/shopserver/apache2/mods-available/macro.load b/drupal-configs/apache2/mods-available/macro.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/macro.load rename to drupal-configs/apache2/mods-available/macro.load diff --git a/drupal-configs/shopserver/apache2/mods-available/mime.conf b/drupal-configs/apache2/mods-available/mime.conf similarity index 99% rename from drupal-configs/shopserver/apache2/mods-available/mime.conf rename to drupal-configs/apache2/mods-available/mime.conf index d1b1d89..37dac86 100644 --- a/drupal-configs/shopserver/apache2/mods-available/mime.conf +++ b/drupal-configs/apache2/mods-available/mime.conf @@ -242,7 +242,9 @@ # (You will also need to add "Includes" to the "Options" directive.) # AddType text/html .shtml + AddOutputFilter INCLUDES .shtml + diff --git a/drupal-configs/shopserver/apache2/mods-available/mime.load b/drupal-configs/apache2/mods-available/mime.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/mime.load rename to drupal-configs/apache2/mods-available/mime.load diff --git a/drupal-configs/shopserver/apache2/mods-available/mime_magic.conf b/drupal-configs/apache2/mods-available/mime_magic.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/mime_magic.conf rename to drupal-configs/apache2/mods-available/mime_magic.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/mime_magic.load b/drupal-configs/apache2/mods-available/mime_magic.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/mime_magic.load rename to drupal-configs/apache2/mods-available/mime_magic.load diff --git a/drupal-configs/shopserver/apache2/mods-available/mpm_event.conf b/drupal-configs/apache2/mods-available/mpm_event.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/mpm_event.conf rename to drupal-configs/apache2/mods-available/mpm_event.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/mpm_event.load b/drupal-configs/apache2/mods-available/mpm_event.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/mpm_event.load rename to drupal-configs/apache2/mods-available/mpm_event.load diff --git a/drupal-configs/apache2/mods-available/mpm_prefork.conf b/drupal-configs/apache2/mods-available/mpm_prefork.conf new file mode 100644 index 0000000..2642e3b --- /dev/null +++ b/drupal-configs/apache2/mods-available/mpm_prefork.conf @@ -0,0 +1,16 @@ +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# MaxRequestWorkers: maximum number of server processes allowed to start +# MaxConnectionsPerChild: maximum number of requests a server process serves + + + StartServers 5 + MinSpareServers 5 + MaxSpareServers 10 + MaxRequestWorkers 150 + MaxConnectionsPerChild 0 + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/drupal-configs/shopserver/apache2/mods-available/mpm_prefork.load b/drupal-configs/apache2/mods-available/mpm_prefork.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/mpm_prefork.load rename to drupal-configs/apache2/mods-available/mpm_prefork.load diff --git a/drupal-configs/shopserver/apache2/mods-available/mpm_worker.conf b/drupal-configs/apache2/mods-available/mpm_worker.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/mpm_worker.conf rename to drupal-configs/apache2/mods-available/mpm_worker.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/mpm_worker.load b/drupal-configs/apache2/mods-available/mpm_worker.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/mpm_worker.load rename to drupal-configs/apache2/mods-available/mpm_worker.load diff --git a/drupal-configs/shopserver/apache2/mods-available/negotiation.conf b/drupal-configs/apache2/mods-available/negotiation.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/negotiation.conf rename to drupal-configs/apache2/mods-available/negotiation.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/negotiation.load b/drupal-configs/apache2/mods-available/negotiation.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/negotiation.load rename to drupal-configs/apache2/mods-available/negotiation.load diff --git a/drupal-configs/shopserver/apache2/mods-available/php5.conf b/drupal-configs/apache2/mods-available/php7.2.conf similarity index 82% rename from drupal-configs/shopserver/apache2/mods-available/php5.conf rename to drupal-configs/apache2/mods-available/php7.2.conf index 2e9772f..d4df3e5 100644 --- a/drupal-configs/shopserver/apache2/mods-available/php5.conf +++ b/drupal-configs/apache2/mods-available/php7.2.conf @@ -1,4 +1,4 @@ - + SetHandler application/x-httpd-php @@ -6,13 +6,11 @@ # Deny access to raw php sources by default # To re-enable it's recommended to enable access to the files # only in specific virtual host or directory - Order Deny,Allow - Deny from all + Require all denied # Deny access to files without filename (e.g. '.php') - - Order Deny,Allow - Deny from all + + Require all denied # Running PHP scripts in user directories is disabled by default diff --git a/drupal-configs/apache2/mods-available/php7.2.load b/drupal-configs/apache2/mods-available/php7.2.load new file mode 100644 index 0000000..0ff366e --- /dev/null +++ b/drupal-configs/apache2/mods-available/php7.2.load @@ -0,0 +1,3 @@ +# Conflicts: php5 +# Depends: mpm_prefork +LoadModule php7_module /usr/lib/apache2/modules/libphp7.2.so diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy.conf b/drupal-configs/apache2/mods-available/proxy.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy.conf rename to drupal-configs/apache2/mods-available/proxy.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy.load b/drupal-configs/apache2/mods-available/proxy.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy.load rename to drupal-configs/apache2/mods-available/proxy.load diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_ajp.load b/drupal-configs/apache2/mods-available/proxy_ajp.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_ajp.load rename to drupal-configs/apache2/mods-available/proxy_ajp.load diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_balancer.conf b/drupal-configs/apache2/mods-available/proxy_balancer.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_balancer.conf rename to drupal-configs/apache2/mods-available/proxy_balancer.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_balancer.load b/drupal-configs/apache2/mods-available/proxy_balancer.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_balancer.load rename to drupal-configs/apache2/mods-available/proxy_balancer.load diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_connect.load b/drupal-configs/apache2/mods-available/proxy_connect.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_connect.load rename to drupal-configs/apache2/mods-available/proxy_connect.load diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_express.load b/drupal-configs/apache2/mods-available/proxy_express.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_express.load rename to drupal-configs/apache2/mods-available/proxy_express.load diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_fcgi.load b/drupal-configs/apache2/mods-available/proxy_fcgi.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_fcgi.load rename to drupal-configs/apache2/mods-available/proxy_fcgi.load diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_fdpass.load b/drupal-configs/apache2/mods-available/proxy_fdpass.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_fdpass.load rename to drupal-configs/apache2/mods-available/proxy_fdpass.load diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_ftp.conf b/drupal-configs/apache2/mods-available/proxy_ftp.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_ftp.conf rename to drupal-configs/apache2/mods-available/proxy_ftp.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_ftp.load b/drupal-configs/apache2/mods-available/proxy_ftp.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_ftp.load rename to drupal-configs/apache2/mods-available/proxy_ftp.load diff --git a/drupal-configs/apache2/mods-available/proxy_hcheck.load b/drupal-configs/apache2/mods-available/proxy_hcheck.load new file mode 100644 index 0000000..b70f421 --- /dev/null +++ b/drupal-configs/apache2/mods-available/proxy_hcheck.load @@ -0,0 +1,2 @@ +# Depends: proxy +LoadModule proxy_hcheck_module /usr/lib/apache2/modules/mod_proxy_hcheck.so diff --git a/drupal-configs/apache2/mods-available/proxy_html.conf b/drupal-configs/apache2/mods-available/proxy_html.conf new file mode 100644 index 0000000..14692ad --- /dev/null +++ b/drupal-configs/apache2/mods-available/proxy_html.conf @@ -0,0 +1,75 @@ +# Configuration example. +# +# For detailed information about these directives see +# +# and for mod_xml2enc see +# +# + +# All knowledge of HTML links has been removed from the mod_proxy_html +# code itself, and is instead read from httpd.conf (or included file) +# at server startup. So you MUST declare it. This will normally be +# at top level, but can also be used in a . +# +# Here's the declaration for W3C HTML 4.01 and XHTML 1.0 + +ProxyHTMLLinks a href +ProxyHTMLLinks area href +ProxyHTMLLinks link href +ProxyHTMLLinks img src longdesc usemap +ProxyHTMLLinks object classid codebase data usemap +ProxyHTMLLinks q cite +ProxyHTMLLinks blockquote cite +ProxyHTMLLinks ins cite +ProxyHTMLLinks del cite +ProxyHTMLLinks form action +ProxyHTMLLinks input src usemap +ProxyHTMLLinks head profile +ProxyHTMLLinks base href +ProxyHTMLLinks script src for + +# To support scripting events (with ProxyHTMLExtended On), +# you'll need to declare them too. + +ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \ + onmouseover onmousemove onmouseout onkeypress \ + onkeydown onkeyup onfocus onblur onload \ + onunload onsubmit onreset onselect onchange + +# If you need to support legacy (pre-1998, aka "transitional") HTML or XHTML, +# you'll need to uncomment the following deprecated link attributes. +# Note that these are enabled in earlier mod_proxy_html versions +# +# ProxyHTMLLinks frame src longdesc +# ProxyHTMLLinks iframe src longdesc +# ProxyHTMLLinks body background +# ProxyHTMLLinks applet codebase +# +# If you're dealing with proprietary HTML variants, +# declare your own URL attributes here as required. +# +# ProxyHTMLLinks myelement myattr otherattr +# +########### +# EXAMPLE # +########### +# +# To define the URL /my-gateway/ as a gateway to an appserver with address +# http://some.app.intranet/ on a private network, after loading the +# modules and including this configuration file: +# +# ProxyRequests Off <-- this is an important security setting +# ProxyPass /my-gateway/ http://some.app.intranet/ +# +# ProxyPassReverse / +# ProxyHTMLEnable On +# ProxyHTMLURLMap http://some.app.intranet/ /my-gateway/ +# ProxyHTMLURLMap / /my-gateway/ +# +# +# Many (though not all) real-life setups are more complex. +# +# See the documentation at +# http://apache.webthing.com/mod_proxy_html/ +# and the tutorial at +# http://www.apachetutor.org/admin/reverseproxies diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_html.load b/drupal-configs/apache2/mods-available/proxy_html.load similarity index 74% rename from drupal-configs/shopserver/apache2/mods-available/proxy_html.load rename to drupal-configs/apache2/mods-available/proxy_html.load index d8b248e..50f1a2c 100644 --- a/drupal-configs/shopserver/apache2/mods-available/proxy_html.load +++ b/drupal-configs/apache2/mods-available/proxy_html.load @@ -1,2 +1,2 @@ -# Depends: proxy +# Depends: proxy xml2enc LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_http.load b/drupal-configs/apache2/mods-available/proxy_http.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_http.load rename to drupal-configs/apache2/mods-available/proxy_http.load diff --git a/drupal-configs/apache2/mods-available/proxy_http2.load b/drupal-configs/apache2/mods-available/proxy_http2.load new file mode 100644 index 0000000..b251d0c --- /dev/null +++ b/drupal-configs/apache2/mods-available/proxy_http2.load @@ -0,0 +1,2 @@ +# Depends: proxy http2 +LoadModule proxy_http2_module /usr/lib/apache2/modules/mod_proxy_http2.so diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_scgi.load b/drupal-configs/apache2/mods-available/proxy_scgi.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_scgi.load rename to drupal-configs/apache2/mods-available/proxy_scgi.load diff --git a/drupal-configs/shopserver/apache2/mods-available/proxy_wstunnel.load b/drupal-configs/apache2/mods-available/proxy_wstunnel.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/proxy_wstunnel.load rename to drupal-configs/apache2/mods-available/proxy_wstunnel.load diff --git a/drupal-configs/shopserver/apache2/mods-available/ratelimit.load b/drupal-configs/apache2/mods-available/ratelimit.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/ratelimit.load rename to drupal-configs/apache2/mods-available/ratelimit.load diff --git a/drupal-configs/shopserver/apache2/mods-available/reflector.load b/drupal-configs/apache2/mods-available/reflector.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/reflector.load rename to drupal-configs/apache2/mods-available/reflector.load diff --git a/drupal-configs/shopserver/apache2/mods-available/remoteip.load b/drupal-configs/apache2/mods-available/remoteip.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/remoteip.load rename to drupal-configs/apache2/mods-available/remoteip.load diff --git a/drupal-configs/shopserver/apache2/mods-available/reqtimeout.conf b/drupal-configs/apache2/mods-available/reqtimeout.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/reqtimeout.conf rename to drupal-configs/apache2/mods-available/reqtimeout.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/reqtimeout.load b/drupal-configs/apache2/mods-available/reqtimeout.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/reqtimeout.load rename to drupal-configs/apache2/mods-available/reqtimeout.load diff --git a/drupal-configs/shopserver/apache2/mods-available/request.load b/drupal-configs/apache2/mods-available/request.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/request.load rename to drupal-configs/apache2/mods-available/request.load diff --git a/drupal-configs/shopserver/apache2/mods-available/rewrite.load b/drupal-configs/apache2/mods-available/rewrite.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/rewrite.load rename to drupal-configs/apache2/mods-available/rewrite.load diff --git a/drupal-configs/shopserver/apache2/mods-available/sed.load b/drupal-configs/apache2/mods-available/sed.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/sed.load rename to drupal-configs/apache2/mods-available/sed.load diff --git a/drupal-configs/shopserver/apache2/mods-available/session.load b/drupal-configs/apache2/mods-available/session.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/session.load rename to drupal-configs/apache2/mods-available/session.load diff --git a/drupal-configs/shopserver/apache2/mods-available/session_cookie.load b/drupal-configs/apache2/mods-available/session_cookie.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/session_cookie.load rename to drupal-configs/apache2/mods-available/session_cookie.load diff --git a/drupal-configs/shopserver/apache2/mods-available/session_crypto.load b/drupal-configs/apache2/mods-available/session_crypto.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/session_crypto.load rename to drupal-configs/apache2/mods-available/session_crypto.load diff --git a/drupal-configs/shopserver/apache2/mods-available/session_dbd.load b/drupal-configs/apache2/mods-available/session_dbd.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/session_dbd.load rename to drupal-configs/apache2/mods-available/session_dbd.load diff --git a/drupal-configs/shopserver/apache2/mods-available/setenvif.conf b/drupal-configs/apache2/mods-available/setenvif.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/setenvif.conf rename to drupal-configs/apache2/mods-available/setenvif.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/setenvif.load b/drupal-configs/apache2/mods-available/setenvif.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/setenvif.load rename to drupal-configs/apache2/mods-available/setenvif.load diff --git a/drupal-configs/shopserver/apache2/mods-available/slotmem_plain.load b/drupal-configs/apache2/mods-available/slotmem_plain.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/slotmem_plain.load rename to drupal-configs/apache2/mods-available/slotmem_plain.load diff --git a/drupal-configs/shopserver/apache2/mods-available/slotmem_shm.load b/drupal-configs/apache2/mods-available/slotmem_shm.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/slotmem_shm.load rename to drupal-configs/apache2/mods-available/slotmem_shm.load diff --git a/drupal-configs/shopserver/apache2/mods-available/socache_dbm.load b/drupal-configs/apache2/mods-available/socache_dbm.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/socache_dbm.load rename to drupal-configs/apache2/mods-available/socache_dbm.load diff --git a/drupal-configs/shopserver/apache2/mods-available/socache_memcache.load b/drupal-configs/apache2/mods-available/socache_memcache.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/socache_memcache.load rename to drupal-configs/apache2/mods-available/socache_memcache.load diff --git a/drupal-configs/shopserver/apache2/mods-available/socache_shmcb.load b/drupal-configs/apache2/mods-available/socache_shmcb.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/socache_shmcb.load rename to drupal-configs/apache2/mods-available/socache_shmcb.load diff --git a/drupal-configs/shopserver/apache2/mods-available/speling.load b/drupal-configs/apache2/mods-available/speling.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/speling.load rename to drupal-configs/apache2/mods-available/speling.load diff --git a/drupal-configs/shopserver/apache2/mods-available/ssl.conf_1467135174_Tue_Jun_28_13_32_54_2016_.cfsaved b/drupal-configs/apache2/mods-available/ssl.conf similarity index 77% rename from drupal-configs/shopserver/apache2/mods-available/ssl.conf_1467135174_Tue_Jun_28_13_32_54_2016_.cfsaved rename to drupal-configs/apache2/mods-available/ssl.conf index e9fcf4f..1dc4eea 100644 --- a/drupal-configs/shopserver/apache2/mods-available/ssl.conf_1467135174_Tue_Jun_28_13_32_54_2016_.cfsaved +++ b/drupal-configs/apache2/mods-available/ssl.conf @@ -33,7 +33,7 @@ # Configure the pass phrase gathering process. # The filtering dialog program (`builtin' is a internal # terminal dialog) has to provide the pass phrase on stdout. - SSLPassPhraseDialog exec:/usr/share/apache2/ask-for-passphrase + SSLPassPhraseDialog exec:/usr/share/apache2/ask-for-passphrase # Inter-Process Session Cache: # Configure the SSL Session Cache: First the mechanism @@ -56,25 +56,21 @@ # ciphers(1) man page from the openssl package for list of all available # options. # Enable only secure ciphers: - SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5 + SSLCipherSuite HIGH:!aNULL - # Speed-optimized SSL Cipher configuration: - # If speed is your main concern (on busy HTTPS servers e.g.), - # you might want to force clients to specific, performance - # optimized ciphers. In this case, prepend those ciphers - # to the SSLCipherSuite list, and enable SSLHonorCipherOrder. - # Caveat: by giving precedence to RC4-SHA and AES128-SHA - # (as in the example below), most connections will no longer - # have perfect forward secrecy - if the server's key is - # compromised, captures of past or future traffic must be - # considered compromised, too. - #SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5 + # SSL server cipher order preference: + # Use server priorities for cipher algorithm choice. + # Clients may prefer lower grade encryption. You should enable this + # option if you want to enforce stronger encryption, and can afford + # the CPU cost, and did not override SSLCipherSuite in a way that puts + # insecure ciphers first. + # Default: Off #SSLHonorCipherOrder on # The protocols to enable. # Available values: all, SSLv3, TLSv1, TLSv1.1, TLSv1.2 # SSL v2 is no longer supported - SSLProtocol all + SSLProtocol all -SSLv3 # Allow insecure renegotiation with clients which do not yet support the # secure renegotiation protocol. Default: Off diff --git a/drupal-configs/shopserver/apache2/mods-available/ssl.load b/drupal-configs/apache2/mods-available/ssl.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/ssl.load rename to drupal-configs/apache2/mods-available/ssl.load diff --git a/drupal-configs/shopserver/apache2/mods-available/status.conf b/drupal-configs/apache2/mods-available/status.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/status.conf rename to drupal-configs/apache2/mods-available/status.conf diff --git a/drupal-configs/shopserver/apache2/mods-available/status.load b/drupal-configs/apache2/mods-available/status.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/status.load rename to drupal-configs/apache2/mods-available/status.load diff --git a/drupal-configs/shopserver/apache2/mods-available/substitute.load b/drupal-configs/apache2/mods-available/substitute.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/substitute.load rename to drupal-configs/apache2/mods-available/substitute.load diff --git a/drupal-configs/shopserver/apache2/mods-available/suexec.load b/drupal-configs/apache2/mods-available/suexec.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/suexec.load rename to drupal-configs/apache2/mods-available/suexec.load diff --git a/drupal-configs/shopserver/apache2/mods-available/unique_id.load b/drupal-configs/apache2/mods-available/unique_id.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/unique_id.load rename to drupal-configs/apache2/mods-available/unique_id.load diff --git a/drupal-configs/shopserver/apache2/mods-available/userdir.conf b/drupal-configs/apache2/mods-available/userdir.conf similarity index 68% rename from drupal-configs/shopserver/apache2/mods-available/userdir.conf rename to drupal-configs/apache2/mods-available/userdir.conf index a6c0da6..2c334ec 100644 --- a/drupal-configs/shopserver/apache2/mods-available/userdir.conf +++ b/drupal-configs/apache2/mods-available/userdir.conf @@ -5,12 +5,7 @@ AllowOverride FileInfo AuthConfig Limit Indexes Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec - - Require all granted - - - Require all denied - + Require method GET POST OPTIONS diff --git a/drupal-configs/shopserver/apache2/mods-available/userdir.load b/drupal-configs/apache2/mods-available/userdir.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/userdir.load rename to drupal-configs/apache2/mods-available/userdir.load diff --git a/drupal-configs/shopserver/apache2/mods-available/usertrack.load b/drupal-configs/apache2/mods-available/usertrack.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/usertrack.load rename to drupal-configs/apache2/mods-available/usertrack.load diff --git a/drupal-configs/shopserver/apache2/mods-available/vhost_alias.load b/drupal-configs/apache2/mods-available/vhost_alias.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/vhost_alias.load rename to drupal-configs/apache2/mods-available/vhost_alias.load diff --git a/drupal-configs/shopserver/apache2/mods-available/xml2enc.load b/drupal-configs/apache2/mods-available/xml2enc.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-available/xml2enc.load rename to drupal-configs/apache2/mods-available/xml2enc.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/access_compat.load b/drupal-configs/apache2/mods-enabled/access_compat.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/access_compat.load rename to drupal-configs/apache2/mods-enabled/access_compat.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/alias.conf b/drupal-configs/apache2/mods-enabled/alias.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/alias.conf rename to drupal-configs/apache2/mods-enabled/alias.conf diff --git a/drupal-configs/shopserver/apache2/mods-enabled/alias.load b/drupal-configs/apache2/mods-enabled/alias.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/alias.load rename to drupal-configs/apache2/mods-enabled/alias.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/auth_basic.load b/drupal-configs/apache2/mods-enabled/auth_basic.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/auth_basic.load rename to drupal-configs/apache2/mods-enabled/auth_basic.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/authn_core.load b/drupal-configs/apache2/mods-enabled/authn_core.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/authn_core.load rename to drupal-configs/apache2/mods-enabled/authn_core.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/authn_file.load b/drupal-configs/apache2/mods-enabled/authn_file.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/authn_file.load rename to drupal-configs/apache2/mods-enabled/authn_file.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/authz_core.load b/drupal-configs/apache2/mods-enabled/authz_core.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/authz_core.load rename to drupal-configs/apache2/mods-enabled/authz_core.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/authz_host.load b/drupal-configs/apache2/mods-enabled/authz_host.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/authz_host.load rename to drupal-configs/apache2/mods-enabled/authz_host.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/authz_user.load b/drupal-configs/apache2/mods-enabled/authz_user.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/authz_user.load rename to drupal-configs/apache2/mods-enabled/authz_user.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/autoindex.conf b/drupal-configs/apache2/mods-enabled/autoindex.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/autoindex.conf rename to drupal-configs/apache2/mods-enabled/autoindex.conf diff --git a/drupal-configs/shopserver/apache2/mods-enabled/autoindex.load b/drupal-configs/apache2/mods-enabled/autoindex.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/autoindex.load rename to drupal-configs/apache2/mods-enabled/autoindex.load diff --git a/drupal-configs/apache2/mods-enabled/deflate.conf b/drupal-configs/apache2/mods-enabled/deflate.conf new file mode 100644 index 0000000..db48f92 --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/deflate.conf @@ -0,0 +1,10 @@ + + + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css + AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript + AddOutputFilterByType DEFLATE application/rss+xml + AddOutputFilterByType DEFLATE application/xml + + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/drupal-configs/apache2/mods-enabled/deflate.load b/drupal-configs/apache2/mods-enabled/deflate.load new file mode 100644 index 0000000..3873ffc --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/deflate.load @@ -0,0 +1,2 @@ +# Depends: filter +LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so diff --git a/drupal-configs/shopserver/apache2/mods-enabled/dir.conf b/drupal-configs/apache2/mods-enabled/dir.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/dir.conf rename to drupal-configs/apache2/mods-enabled/dir.conf diff --git a/drupal-configs/shopserver/apache2/mods-enabled/dir.load b/drupal-configs/apache2/mods-enabled/dir.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/dir.load rename to drupal-configs/apache2/mods-enabled/dir.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/env.load b/drupal-configs/apache2/mods-enabled/env.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/env.load rename to drupal-configs/apache2/mods-enabled/env.load diff --git a/drupal-configs/apache2/mods-enabled/expires.load b/drupal-configs/apache2/mods-enabled/expires.load new file mode 100644 index 0000000..092acab --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/expires.load @@ -0,0 +1 @@ +LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so diff --git a/drupal-configs/apache2/mods-enabled/fcgid.conf b/drupal-configs/apache2/mods-enabled/fcgid.conf new file mode 100644 index 0000000..ace956d --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/fcgid.conf @@ -0,0 +1,7 @@ + + FcgidConnectTimeout 20 + + + AddHandler fcgid-script .fcgi + + diff --git a/drupal-configs/apache2/mods-enabled/fcgid.load b/drupal-configs/apache2/mods-enabled/fcgid.load new file mode 100644 index 0000000..3c15f74 --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/fcgid.load @@ -0,0 +1 @@ +LoadModule fcgid_module /usr/lib/apache2/modules/mod_fcgid.so diff --git a/drupal-configs/shopserver/apache2/mods-enabled/filter.load b/drupal-configs/apache2/mods-enabled/filter.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/filter.load rename to drupal-configs/apache2/mods-enabled/filter.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/headers.load b/drupal-configs/apache2/mods-enabled/headers.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/headers.load rename to drupal-configs/apache2/mods-enabled/headers.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/mime.conf b/drupal-configs/apache2/mods-enabled/mime.conf similarity index 99% rename from drupal-configs/shopserver/apache2/mods-enabled/mime.conf rename to drupal-configs/apache2/mods-enabled/mime.conf index d1b1d89..37dac86 100644 --- a/drupal-configs/shopserver/apache2/mods-enabled/mime.conf +++ b/drupal-configs/apache2/mods-enabled/mime.conf @@ -242,7 +242,9 @@ # (You will also need to add "Includes" to the "Options" directive.) # AddType text/html .shtml + AddOutputFilter INCLUDES .shtml + diff --git a/drupal-configs/shopserver/apache2/mods-enabled/mime.load b/drupal-configs/apache2/mods-enabled/mime.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/mime.load rename to drupal-configs/apache2/mods-enabled/mime.load diff --git a/drupal-configs/apache2/mods-enabled/mpm_prefork.conf b/drupal-configs/apache2/mods-enabled/mpm_prefork.conf new file mode 100644 index 0000000..2642e3b --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/mpm_prefork.conf @@ -0,0 +1,16 @@ +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# MaxRequestWorkers: maximum number of server processes allowed to start +# MaxConnectionsPerChild: maximum number of requests a server process serves + + + StartServers 5 + MinSpareServers 5 + MaxSpareServers 10 + MaxRequestWorkers 150 + MaxConnectionsPerChild 0 + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/drupal-configs/shopserver/apache2/mods-enabled/mpm_prefork.load b/drupal-configs/apache2/mods-enabled/mpm_prefork.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/mpm_prefork.load rename to drupal-configs/apache2/mods-enabled/mpm_prefork.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/negotiation.conf b/drupal-configs/apache2/mods-enabled/negotiation.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/negotiation.conf rename to drupal-configs/apache2/mods-enabled/negotiation.conf diff --git a/drupal-configs/shopserver/apache2/mods-enabled/negotiation.load b/drupal-configs/apache2/mods-enabled/negotiation.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/negotiation.load rename to drupal-configs/apache2/mods-enabled/negotiation.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/php5.conf b/drupal-configs/apache2/mods-enabled/php7.2.conf similarity index 82% rename from drupal-configs/shopserver/apache2/mods-enabled/php5.conf rename to drupal-configs/apache2/mods-enabled/php7.2.conf index 2e9772f..d4df3e5 100644 --- a/drupal-configs/shopserver/apache2/mods-enabled/php5.conf +++ b/drupal-configs/apache2/mods-enabled/php7.2.conf @@ -1,4 +1,4 @@ - + SetHandler application/x-httpd-php @@ -6,13 +6,11 @@ # Deny access to raw php sources by default # To re-enable it's recommended to enable access to the files # only in specific virtual host or directory - Order Deny,Allow - Deny from all + Require all denied # Deny access to files without filename (e.g. '.php') - - Order Deny,Allow - Deny from all + + Require all denied # Running PHP scripts in user directories is disabled by default diff --git a/drupal-configs/apache2/mods-enabled/php7.2.load b/drupal-configs/apache2/mods-enabled/php7.2.load new file mode 100644 index 0000000..0ff366e --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/php7.2.load @@ -0,0 +1,3 @@ +# Conflicts: php5 +# Depends: mpm_prefork +LoadModule php7_module /usr/lib/apache2/modules/libphp7.2.so diff --git a/drupal-configs/apache2/mods-enabled/proxy.conf b/drupal-configs/apache2/mods-enabled/proxy.conf new file mode 100644 index 0000000..cf4a9fb --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/proxy.conf @@ -0,0 +1,27 @@ + + + # If you want to use apache2 as a forward proxy, uncomment the + # 'ProxyRequests On' line and the block below. + # WARNING: Be careful to restrict access inside the block. + # Open proxy servers are dangerous both to your network and to the + # Internet at large. + # + # If you only want to use apache2 as a reverse proxy/gateway in + # front of some web application server, you DON'T need + # 'ProxyRequests On'. + + #ProxyRequests On + # + # AddDefaultCharset off + # Require all denied + # #Require local + # + + # Enable/disable the handling of HTTP/1.1 "Via:" headers. + # ("Full" adds the server version; "Block" removes all outgoing Via: headers) + # Set to one of: Off | On | Full | Block + #ProxyVia Off + + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/drupal-configs/apache2/mods-enabled/proxy.load b/drupal-configs/apache2/mods-enabled/proxy.load new file mode 100644 index 0000000..8828205 --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/proxy.load @@ -0,0 +1 @@ +LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so diff --git a/drupal-configs/apache2/mods-enabled/proxy_fcgi.load b/drupal-configs/apache2/mods-enabled/proxy_fcgi.load new file mode 100644 index 0000000..067c87e --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/proxy_fcgi.load @@ -0,0 +1,2 @@ +# Depends: proxy +LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so diff --git a/drupal-configs/apache2/mods-enabled/reqtimeout.conf b/drupal-configs/apache2/mods-enabled/reqtimeout.conf new file mode 100644 index 0000000..534cd88 --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/reqtimeout.conf @@ -0,0 +1,27 @@ + + + # mod_reqtimeout limits the time waiting on the client to prevent an + # attacker from causing a denial of service by opening many connections + # but not sending requests. This file tries to give a sensible default + # configuration, but it may be necessary to tune the timeout values to + # the actual situation. Note that it is also possible to configure + # mod_reqtimeout per virtual host. + + + # Wait max 20 seconds for the first byte of the request line+headers + # From then, require a minimum data rate of 500 bytes/s, but don't + # wait longer than 40 seconds in total. + # Note: Lower timeouts may make sense on non-ssl virtual hosts but can + # cause problem with ssl enabled virtual hosts: This timeout includes + # the time a browser may need to fetch the CRL for the certificate. If + # the CRL server is not reachable, it may take more than 10 seconds + # until the browser gives up. + RequestReadTimeout header=20-40,minrate=500 + + # Wait max 10 seconds for the first byte of the request body (if any) + # From then, require a minimum data rate of 500 bytes/s + RequestReadTimeout body=10,minrate=500 + + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/drupal-configs/apache2/mods-enabled/reqtimeout.load b/drupal-configs/apache2/mods-enabled/reqtimeout.load new file mode 100644 index 0000000..8b2c5e6 --- /dev/null +++ b/drupal-configs/apache2/mods-enabled/reqtimeout.load @@ -0,0 +1 @@ +LoadModule reqtimeout_module /usr/lib/apache2/modules/mod_reqtimeout.so diff --git a/drupal-configs/shopserver/apache2/mods-enabled/rewrite.load b/drupal-configs/apache2/mods-enabled/rewrite.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/rewrite.load rename to drupal-configs/apache2/mods-enabled/rewrite.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/setenvif.conf b/drupal-configs/apache2/mods-enabled/setenvif.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/setenvif.conf rename to drupal-configs/apache2/mods-enabled/setenvif.conf diff --git a/drupal-configs/shopserver/apache2/mods-enabled/setenvif.load b/drupal-configs/apache2/mods-enabled/setenvif.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/setenvif.load rename to drupal-configs/apache2/mods-enabled/setenvif.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/socache_shmcb.load b/drupal-configs/apache2/mods-enabled/socache_shmcb.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/socache_shmcb.load rename to drupal-configs/apache2/mods-enabled/socache_shmcb.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/ssl.conf b/drupal-configs/apache2/mods-enabled/ssl.conf similarity index 76% rename from drupal-configs/shopserver/apache2/mods-enabled/ssl.conf rename to drupal-configs/apache2/mods-enabled/ssl.conf index 1e6d994..1dc4eea 100644 --- a/drupal-configs/shopserver/apache2/mods-enabled/ssl.conf +++ b/drupal-configs/apache2/mods-enabled/ssl.conf @@ -33,7 +33,7 @@ # Configure the pass phrase gathering process. # The filtering dialog program (`builtin' is a internal # terminal dialog) has to provide the pass phrase on stdout. - SSLPassPhraseDialog exec:/usr/share/apache2/ask-for-passphrase + SSLPassPhraseDialog exec:/usr/share/apache2/ask-for-passphrase # Inter-Process Session Cache: # Configure the SSL Session Cache: First the mechanism @@ -56,25 +56,21 @@ # ciphers(1) man page from the openssl package for list of all available # options. # Enable only secure ciphers: - SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5 + SSLCipherSuite HIGH:!aNULL - # Speed-optimized SSL Cipher configuration: - # If speed is your main concern (on busy HTTPS servers e.g.), - # you might want to force clients to specific, performance - # optimized ciphers. In this case, prepend those ciphers - # to the SSLCipherSuite list, and enable SSLHonorCipherOrder. - # Caveat: by giving precedence to RC4-SHA and AES128-SHA - # (as in the example below), most connections will no longer - # have perfect forward secrecy - if the server's key is - # compromised, captures of past or future traffic must be - # considered compromised, too. - #SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5 + # SSL server cipher order preference: + # Use server priorities for cipher algorithm choice. + # Clients may prefer lower grade encryption. You should enable this + # option if you want to enforce stronger encryption, and can afford + # the CPU cost, and did not override SSLCipherSuite in a way that puts + # insecure ciphers first. + # Default: Off #SSLHonorCipherOrder on # The protocols to enable. # Available values: all, SSLv3, TLSv1, TLSv1.1, TLSv1.2 # SSL v2 is no longer supported - SSLProtocol all + SSLProtocol all -SSLv3 # Allow insecure renegotiation with clients which do not yet support the # secure renegotiation protocol. Default: Off @@ -87,4 +83,3 @@ # vim: syntax=apache ts=4 sw=4 sts=4 sr noet -SSLStaplingCache "shmcb:logs/stapling-cache(150000)" diff --git a/drupal-configs/shopserver/apache2/mods-enabled/ssl.load b/drupal-configs/apache2/mods-enabled/ssl.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/ssl.load rename to drupal-configs/apache2/mods-enabled/ssl.load diff --git a/drupal-configs/shopserver/apache2/mods-enabled/status.conf b/drupal-configs/apache2/mods-enabled/status.conf similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/status.conf rename to drupal-configs/apache2/mods-enabled/status.conf diff --git a/drupal-configs/shopserver/apache2/mods-enabled/status.load b/drupal-configs/apache2/mods-enabled/status.load similarity index 100% rename from drupal-configs/shopserver/apache2/mods-enabled/status.load rename to drupal-configs/apache2/mods-enabled/status.load diff --git a/drupal-configs/shopserver/apache2/ports.conf b/drupal-configs/apache2/ports.conf similarity index 100% rename from drupal-configs/shopserver/apache2/ports.conf rename to drupal-configs/apache2/ports.conf diff --git a/drupal-configs/shopserver/apache2/sites-available/000-default.conf b/drupal-configs/apache2/sites-available/000-default.conf similarity index 87% rename from drupal-configs/shopserver/apache2/sites-available/000-default.conf rename to drupal-configs/apache2/sites-available/000-default.conf index cfe8df5..f9ee84b 100644 --- a/drupal-configs/shopserver/apache2/sites-available/000-default.conf +++ b/drupal-configs/apache2/sites-available/000-default.conf @@ -26,6 +26,12 @@ # following line enables the CGI configuration for this host only # after it has been globally disabled with "a2disconf". #Include conf-available/serve-cgi-bin.conf + # Redirect HTTP connections to HTTPS + + RewriteEngine On + RewriteCond %{HTTPS} off + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] + # vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/drupal-configs/shopserver/apache2/sites-available/default-ssl.conf b/drupal-configs/apache2/sites-available/default-ssl.conf similarity index 96% rename from drupal-configs/shopserver/apache2/sites-available/default-ssl.conf rename to drupal-configs/apache2/sites-available/default-ssl.conf index 432b965..7e37a9c 100644 --- a/drupal-configs/shopserver/apache2/sites-available/default-ssl.conf +++ b/drupal-configs/apache2/sites-available/default-ssl.conf @@ -124,11 +124,9 @@ # Similarly, one has to force some clients to use HTTP/1.0 to workaround # their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and # "force-response-1.0" for this. - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + # BrowserMatch "MSIE [2-6]" \ + # nokeepalive ssl-unclean-shutdown \ + # downgrade-1.0 force-response-1.0 diff --git a/drupal-configs/apache2/sites-available/shopserver1p.fsf.org-ssl.conf b/drupal-configs/apache2/sites-available/shopserver1p.fsf.org-ssl.conf new file mode 100644 index 0000000..cf18082 --- /dev/null +++ b/drupal-configs/apache2/sites-available/shopserver1p.fsf.org-ssl.conf @@ -0,0 +1,36 @@ +# File deployed by Ansible, changes will be PRESERVED + + + + ServerName shopserver1p.fsf.org + ServerAdmin sysadmin@gnu.org + + DocumentRoot /var/www/html + + # + # Options -Indexes -FollowSymLinks + # AllowOverride None + # + + SSLEngine on + #SSLUseStapling on + #SSLStaplingReturnResponderErrors off + #SSLStaplingResponderTimeout 5 + SSLCertificateFile /etc/letsencrypt/live/shopserver1p.fsf.org/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/shopserver1p.fsf.org/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/shopserver1p.fsf.org/chain.pem + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + # Log to syslog, to be sent to termite + LogLevel warn + CustomLog "|/usr/bin/logger -t apache -p local4.info" combined + ErrorLog ${APACHE_LOG_DIR}/error.log + + + diff --git a/drupal-configs/apache2/sites-available/shopserver1p.fsf.org.conf b/drupal-configs/apache2/sites-available/shopserver1p.fsf.org.conf new file mode 100644 index 0000000..f5667ed --- /dev/null +++ b/drupal-configs/apache2/sites-available/shopserver1p.fsf.org.conf @@ -0,0 +1,16 @@ +# File deployed by Ansible, changes will be PRESERVED + + + ServerName shopserver1p.fsf.org + + ServerAdmin sysadmin@gnu.org + DocumentRoot /var/www/html + + Redirect permanent / https://shopserver1p.fsf.org/ + + # Log to syslog, to be sent to termite + LogLevel warn + CustomLog "|/usr/bin/logger -t apache -p local4.info" combined + ErrorLog ${APACHE_LOG_DIR}/error.log + + diff --git a/drupal-configs/shopserver/apache2/sites-available/000-default-le-ssl.conf b/drupal-configs/apache2/sites-enabled/000-default.conf similarity index 76% rename from drupal-configs/shopserver/apache2/sites-available/000-default-le-ssl.conf rename to drupal-configs/apache2/sites-enabled/000-default.conf index 22c2b29..f9ee84b 100644 --- a/drupal-configs/shopserver/apache2/sites-available/000-default-le-ssl.conf +++ b/drupal-configs/apache2/sites-enabled/000-default.conf @@ -1,5 +1,4 @@ - - + # The ServerName directive sets the request scheme, hostname and port that # the server uses to identify itself. This is used when creating # redirection URLs. In the context of virtual hosts, the ServerName @@ -27,14 +26,12 @@ # following line enables the CGI configuration for this host only # after it has been globally disabled with "a2disconf". #Include conf-available/serve-cgi-bin.conf -SSLCertificateFile /etc/letsencrypt/live/shopserver0p.fsf.org/cert.pem -SSLCertificateKeyFile /etc/letsencrypt/live/shopserver0p.fsf.org/privkey.pem -Include /etc/letsencrypt/options-ssl-apache.conf -ServerName shop.fsf.org -ServerAlias store.fsf.org -ServerAlias shopserver0p.fsf.org -SSLCertificateChainFile /etc/letsencrypt/live/shopserver0p.fsf.org/chain.pem + # Redirect HTTP connections to HTTPS + + RewriteEngine On + RewriteCond %{HTTPS} off + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] + # vim: syntax=apache ts=4 sw=4 sts=4 sr noet - diff --git a/drupal-configs/apache2/sites-enabled/shopserver1p.fsf.org-ssl.conf b/drupal-configs/apache2/sites-enabled/shopserver1p.fsf.org-ssl.conf new file mode 100644 index 0000000..cf18082 --- /dev/null +++ b/drupal-configs/apache2/sites-enabled/shopserver1p.fsf.org-ssl.conf @@ -0,0 +1,36 @@ +# File deployed by Ansible, changes will be PRESERVED + + + + ServerName shopserver1p.fsf.org + ServerAdmin sysadmin@gnu.org + + DocumentRoot /var/www/html + + # + # Options -Indexes -FollowSymLinks + # AllowOverride None + # + + SSLEngine on + #SSLUseStapling on + #SSLStaplingReturnResponderErrors off + #SSLStaplingResponderTimeout 5 + SSLCertificateFile /etc/letsencrypt/live/shopserver1p.fsf.org/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/shopserver1p.fsf.org/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/shopserver1p.fsf.org/chain.pem + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + # Log to syslog, to be sent to termite + LogLevel warn + CustomLog "|/usr/bin/logger -t apache -p local4.info" combined + ErrorLog ${APACHE_LOG_DIR}/error.log + + + diff --git a/drupal-configs/shopserver/apache2/conf-enabled/ssl.conf b/drupal-configs/shopserver/apache2/conf-enabled/ssl.conf deleted file mode 100644 index 62bef0f..0000000 --- a/drupal-configs/shopserver/apache2/conf-enabled/ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -#SSLUseStapling on -#SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_stapling_cache(128000) -#SSLStaplingResponderTimeout 5 -#SSLStaplingFakeTryLater off -#SSLStaplingReturnResponderErrors off -#SSLStaplingForceURL http://serverproxy0p.fsf.org:8001 - diff --git a/drupal-configs/shopserver/apache2/mods-available/mpm_prefork.conf b/drupal-configs/shopserver/apache2/mods-available/mpm_prefork.conf deleted file mode 100644 index f4fee0e..0000000 --- a/drupal-configs/shopserver/apache2/mods-available/mpm_prefork.conf +++ /dev/null @@ -1,20 +0,0 @@ -# prefork MPM -# StartServers: number of server processes to start -# MinSpareServers: minimum number of server processes which are kept spare -# MaxSpareServers: maximum number of server processes which are kept spare -# MaxRequestWorkers: maximum number of server processes allowed to start -# MaxConnectionsPerChild: maximum number of requests a server process serves - - - StartServers 5 - MinSpareServers 5 - MaxSpareServers 10 - # 150 MaxRequestWorkers is way too high. (20 may also be too high.) we don't need that many, and it caused shop.fsf.org to swap and fail. 15 is better. -- sudoman 2017-08-03 - # Quidam: Restored to 150, which is below the default and below what the vm can take. the swap issue needs to be reevaluated. The machine was failing to serve requests - # sudoman: 150 is wayy too high. apache was using 2 GB ram and 1 GB swap with 130 processes. restarting it with 150 workers caused the ram to be almost used up immediately. 75 is a good compromise. if you want more workers, give the vm more ram. - # sudoman: i gave the shop 2 GB more memory, so 150 should be fine. -- 2018-10-04 - MaxRequestWorkers 150 - MaxConnectionsPerChild 5000 - - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/drupal-configs/shopserver/apache2/mods-available/php5.load b/drupal-configs/shopserver/apache2/mods-available/php5.load deleted file mode 100644 index 653695f..0000000 --- a/drupal-configs/shopserver/apache2/mods-available/php5.load +++ /dev/null @@ -1 +0,0 @@ -LoadModule php5_module /usr/lib/apache2/modules/libphp5.so diff --git a/drupal-configs/shopserver/apache2/mods-available/ssl.conf b/drupal-configs/shopserver/apache2/mods-available/ssl.conf deleted file mode 100644 index 1e6d994..0000000 --- a/drupal-configs/shopserver/apache2/mods-available/ssl.conf +++ /dev/null @@ -1,90 +0,0 @@ - - - # Pseudo Random Number Generator (PRNG): - # Configure one or more sources to seed the PRNG of the SSL library. - # The seed data should be of good random quality. - # WARNING! On some platforms /dev/random blocks if not enough entropy - # is available. This means you then cannot use the /dev/random device - # because it would lead to very long connection times (as long as - # it requires to make more entropy available). But usually those - # platforms additionally provide a /dev/urandom device which doesn't - # block. So, if available, use this one instead. Read the mod_ssl User - # Manual for more details. - # - SSLRandomSeed startup builtin - SSLRandomSeed startup file:/dev/urandom 512 - SSLRandomSeed connect builtin - SSLRandomSeed connect file:/dev/urandom 512 - - ## - ## SSL Global Context - ## - ## All SSL configuration in this context applies both to - ## the main server and all SSL-enabled virtual hosts. - ## - - # - # Some MIME-types for downloading Certificates and CRLs - # - AddType application/x-x509-ca-cert .crt - AddType application/x-pkcs7-crl .crl - - # Pass Phrase Dialog: - # Configure the pass phrase gathering process. - # The filtering dialog program (`builtin' is a internal - # terminal dialog) has to provide the pass phrase on stdout. - SSLPassPhraseDialog exec:/usr/share/apache2/ask-for-passphrase - - # Inter-Process Session Cache: - # Configure the SSL Session Cache: First the mechanism - # to use and second the expiring timeout (in seconds). - # (The mechanism dbm has known memory leaks and should not be used). - #SSLSessionCache dbm:${APACHE_RUN_DIR}/ssl_scache - SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) - SSLSessionCacheTimeout 300 - - # Semaphore: - # Configure the path to the mutual exclusion semaphore the - # SSL engine uses internally for inter-process synchronization. - # (Disabled by default, the global Mutex directive consolidates by default - # this) - #Mutex file:${APACHE_LOCK_DIR}/ssl_mutex ssl-cache - - - # SSL Cipher Suite: - # List the ciphers that the client is permitted to negotiate. See the - # ciphers(1) man page from the openssl package for list of all available - # options. - # Enable only secure ciphers: - SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5 - - # Speed-optimized SSL Cipher configuration: - # If speed is your main concern (on busy HTTPS servers e.g.), - # you might want to force clients to specific, performance - # optimized ciphers. In this case, prepend those ciphers - # to the SSLCipherSuite list, and enable SSLHonorCipherOrder. - # Caveat: by giving precedence to RC4-SHA and AES128-SHA - # (as in the example below), most connections will no longer - # have perfect forward secrecy - if the server's key is - # compromised, captures of past or future traffic must be - # considered compromised, too. - #SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5 - #SSLHonorCipherOrder on - - # The protocols to enable. - # Available values: all, SSLv3, TLSv1, TLSv1.1, TLSv1.2 - # SSL v2 is no longer supported - SSLProtocol all - - # Allow insecure renegotiation with clients which do not yet support the - # secure renegotiation protocol. Default: Off - #SSLInsecureRenegotiation on - - # Whether to forbid non-SNI clients to access name based virtual hosts. - # Default: Off - #SSLStrictSNIVHostCheck On - - - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet -SSLStaplingCache "shmcb:logs/stapling-cache(150000)" diff --git a/drupal-configs/shopserver/apache2/mods-enabled/mpm_prefork.conf b/drupal-configs/shopserver/apache2/mods-enabled/mpm_prefork.conf deleted file mode 100644 index f4fee0e..0000000 --- a/drupal-configs/shopserver/apache2/mods-enabled/mpm_prefork.conf +++ /dev/null @@ -1,20 +0,0 @@ -# prefork MPM -# StartServers: number of server processes to start -# MinSpareServers: minimum number of server processes which are kept spare -# MaxSpareServers: maximum number of server processes which are kept spare -# MaxRequestWorkers: maximum number of server processes allowed to start -# MaxConnectionsPerChild: maximum number of requests a server process serves - - - StartServers 5 - MinSpareServers 5 - MaxSpareServers 10 - # 150 MaxRequestWorkers is way too high. (20 may also be too high.) we don't need that many, and it caused shop.fsf.org to swap and fail. 15 is better. -- sudoman 2017-08-03 - # Quidam: Restored to 150, which is below the default and below what the vm can take. the swap issue needs to be reevaluated. The machine was failing to serve requests - # sudoman: 150 is wayy too high. apache was using 2 GB ram and 1 GB swap with 130 processes. restarting it with 150 workers caused the ram to be almost used up immediately. 75 is a good compromise. if you want more workers, give the vm more ram. - # sudoman: i gave the shop 2 GB more memory, so 150 should be fine. -- 2018-10-04 - MaxRequestWorkers 150 - MaxConnectionsPerChild 5000 - - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/drupal-configs/shopserver/apache2/mods-enabled/php5.load b/drupal-configs/shopserver/apache2/mods-enabled/php5.load deleted file mode 100644 index 653695f..0000000 --- a/drupal-configs/shopserver/apache2/mods-enabled/php5.load +++ /dev/null @@ -1 +0,0 @@ -LoadModule php5_module /usr/lib/apache2/modules/libphp5.so diff --git a/drupal-configs/shopserver/apache2/sites-available/gnupress.org-common b/drupal-configs/shopserver/apache2/sites-available/gnupress.org-common deleted file mode 100644 index 325d93d..0000000 --- a/drupal-configs/shopserver/apache2/sites-available/gnupress.org-common +++ /dev/null @@ -1,13 +0,0 @@ - -## -## redirect root url to shop.fsf.org, otherwise redirect to gnu-press page -## https://rt.gnu.org/Ticket/Display.html?id=1239165 -## - -RedirectMatch temp ^/?$ https://shop.fsf.org/ -Redirect temp / https://www.fsf.org/gnu-press/ - -## - - - diff --git a/drupal-configs/shopserver/apache2/sites-available/gnupress.org.conf b/drupal-configs/shopserver/apache2/sites-available/gnupress.org.conf deleted file mode 100644 index ee199c6..0000000 --- a/drupal-configs/shopserver/apache2/sites-available/gnupress.org.conf +++ /dev/null @@ -1,39 +0,0 @@ -################################################################## - - ServerName gnupress.org - ServerAlias gnupress.com - ServerAlias www.gnupress.org - ServerAlias www.gnupress.com - ServerAdmin webmaster@localhost - - Include /etc/apache2/sites-available/gnupress.org-common - - ErrorLog /var/log/apache2/http-gnupress.org.error.log - CustomLog /var/log/apache2/http-gnupress.org.access.log combined - -################################################################## - -################################################################## - - ServerName gnupress.org - ServerAlias gnupress.com - ServerAlias www.gnupress.org - ServerAlias www.gnupress.com - ServerAdmin webmaster@localhost - - SSLEngine on - - include /etc/apache2/sites-available/ssl-common.conf - - SSLCertificateFile /etc/letsencrypt/live/shopserver0p.fsf.org/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/shopserver0p.fsf.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/shopserver0p.fsf.org/chain.pem - - - Include /etc/apache2/sites-available/gnupress.org-common - - - ErrorLog /var/log/apache2/http-gnupress.org.error.log - CustomLog /var/log/apache2/http-gnupress.org.access.log combined - -################################################################## diff --git a/drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common b/drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common deleted file mode 100644 index cef75e0..0000000 --- a/drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common +++ /dev/null @@ -1,283 +0,0 @@ - RedirectPermanent /favicon.ico http://static.fsf.org/store/img/favicon.ico - RedirectPermanent /product/free-software-free-society https://shop.fsf.org/product/free-software-free-society-2 - - -# Cf. #793226. Ward, 2013-01-23 - Redirect /product/emacs-manual https://shop.fsf.org/product/emacs_manual_26 - Redirect /product/intro-to-emacs-lisp https://shop.fsf.org/product/Intro_to_Emacs_Lisp_3rd_Ed - Redirect /product/debugging-with-gdb https://shop.fsf.org/product/debugging-gdb-gnu-source-level-debugger-10 - Redirect /product/gnu-make https://shop.fsf.org/product/gnu-make-version-381 - # de-activating: using internal donation system - sudoman 2017-01-13 - #RedirectPermanent /category/donate/ https://donate.fsf.org - -# RT 1092489 k054, 2016-03-10 - RedirectPermanent /product/Emacs_Manual/ https://shop.fsf.org/product/Emacs_Manual_245/ - RedirectPermanent /product/Emacs_Manual_24/ https://shop.fsf.org/product/Emacs_Manual_245/ - -#Redirects from old to new shop 2016-04-25 -Redirect /product/emacs-reference-card-v24 https://shop.fsf.org/books-docs/emacs-reference-card-v24 -Redirect /product/emacs-reference-cards-21 https://shop.fsf.org/books-docs/emacs-reference-cards-v-21 -Redirect /product/flex-reference-cards https://shop.fsf.org/books-docs/flex-version-237-reference-cards -Redirect /product/Emacs_Manual_245 https://shop.fsf.org/books/gnu-emacs-manual-17th-edition-v-245 -Redirect /product/debugging-gdb-gnu-source-level-debugger-10 https://shop.fsf.org/books-docs/debugging-gdb-gnu-source-level-debugger-v-731 -Redirect /product/free-software-free-society-2 https://shop.fsf.org/books/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition -Redirect /product/gnu-make-version-381 https://shop.fsf.org/books-docs/gnu-make-version-381 -Redirect /product/bison-manual https://shop.fsf.org/books-docs/bison-manual-v-1875-discounted -Redirect /product/using-gcc-gnu-compiler-collection-reference-manual https://shop.fsf.org/books-docs/using-gcc-gnu-compiler-collection-reference-manual-v-33-discounted -Redirect /product/Intro_to_Emacs_Lisp_3rd_Ed https://shop.fsf.org/books/signed-introduction-programming-emacs-lisp-3rd-edition -Redirect /product/free-software-free-society-3-hardcover https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/free-software-free-society-3-paperback https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/Introduction_to_Command_Line https://shop.fsf.org/books-docs/introduction-command-line -Redirect /product/GNU_cap https://shop.fsf.org/sites/default/files/styles/product_medium/public/productimage-picture-gnu_cap-151.jpg?itok=ubzO0cM8 -Redirect /product/fsf-small-knife https://shop.fsf.org/gear/fsf-rally-knife -Redirect /product/gnulinuxinside https://shop.fsf.org/stickers/gnulinux-inside-sticker-pack -Redirect /product/lp15 https://shop.fsf.org/tshirts-hoodies/libreplanet-2015 -Redirect /product/usb https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator -Redirect /product/signed-rms-photo-print https://shop.fsf.org/wall-art/signed-rms-photo-print -Redirect /product/DRM_No_One_Admitted https://shop.fsf.org/tshirts-hoodies/drm-no-one-admittedgreen -Redirect /product/fsf-30-shirt https://shop.fsf.org/tshirts-hoodies/fsf-30-shirt -Redirect /product/FSFS_Hoodie https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie -Redirect /product/free-software-free-society-shirt-maroon https://shop.fsf.org/tshirts-hoodies/free-software-free-society-shirt -Redirect /product/gnu-polo-shirt https://shop.fsf.org/tshirts-hoodies/gnu-polo-shirt -Redirect /product/gnuhead-grey https://shop.fsf.org/tshirts-hoodies/gnuhead-grey -Redirect /product/gplv3-gray-hoodie https://shop.fsf.org/tshirts-hoodies/gplv3-hoodie -Redirect /product/GPLv3_Hoodie https://shop.fsf.org/tshirts-hoodies/gplv3-hoodie -Redirect /product/LibrePlanet2012Yellow https://shop.fsf.org/tshirts-hoodies/libreplanet-2012 -Redirect /product/lp16 https://shop.fsf.org/tshirts-hoodies/libreplanet-2016-t-shirt -Redirect /product/Live_The_Dream https://shop.fsf.org/tshirts-hoodies/live-dream -Redirect /product/Mediagoblin https://shop.fsf.org/tshirts-hoodies/mediagoblin -Redirect /product/run-gcc-shirt https://shop.fsf.org/tshirts-hoodies/run-gcc-shirt -Redirect /product/Thanx_Gnu https://shop.fsf.org/tshirts-hoodies/thanx-gnu -Redirect /product/mediagoblin-black https://shop.fsf.org/tshirts-hoodies/mediagoblin-black -Redirect /product/FSF-Polo-Shirt https://shop.fsf.org/tshirts-hoodies/fsf-polo-shirt -Redirect /product/Gnu_Head_shirt https://shop.fsf.org/tshirts-hoodies/gnu-head -Redirect /product/lp-tshirt https://shop.fsf.org/tshirts-hoodies/libreplanet -Redirect /product/Libreplanet2013 https://shop.fsf.org/tshirts-hoodies/libreplanet-2013 -Redirect /product/gplv3-t-shirt-black https://shop.fsf.org/tshirts-hoodies/gplv3 -Redirect /product/gplv3-t-shirt-gray https://shop.fsf.org/tshirts-hoodies/gplv3 -Redirect /product/happy-hacking-shirt https://shop.fsf.org/tshirts-hoodies/happy-hacking-t-shirt -Redirect /product/gnu-beanie https://shop.fsf.org/tshirts-hoodies/gnu-beanie -Redirect /product/gnu-20th-annv-leather-keychain https://shop.fsf.org/gear/gnu-20th-anniversary-leather-keychain -Redirect /product/gnu-30-travel-mug https://shop.fsf.org/gear/gnu-30-travel-mug -Redirect /product/gnu-emblem-leather-keychain https://shop.fsf.org/gear/gnu-emblem-leather-keychain -Redirect /product/gnu-emacs-reference-mugs https://shop.fsf.org/gear/gnu-emacs-reference-mugs -Redirect /product/stuffed-baby-gnu https://shop.fsf.org/gear/stuffed-baby-gnu -Redirect /product/button-grab-bag https://shop.fsf.org/gear/button-grab-bag -Redirect /product/gnu-emblem-classic-pin https://shop.fsf.org/gear/gnu-emblem-classic-pin -Redirect /product/run-gcc-sticker https://shop.fsf.org/stickers/run-gcc-sticker -Redirect /product/super-sticker-mega-multi-pack https://shop.fsf.org/stickers/super-sticker-mega-multi-pack -Redirect /product/free-software-free-society-3-hardcover-signed https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/Signed_Intro_to_Emacs_Lisp_3rd_Ed https://shop.fsf.org/books/signed-introduction-programming-emacs-lisp-3rd-edition -Redirect /tshirts-hoodies/emacs-logo-t-shirt https://shop.fsf.org/tshirts-hoodies/gnu-emacs-logo-t-shirt - - -Redirect /tshirts-hoodies/drm-no-one-admittedgreen https://shop.fsf.org/tshirts-hoodies/drm-no-one-admitted - -Redirect /books/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition - -Redirect /product/free-as-in-freedom-2 https://shop.fsf.org/books/free-freedom-20-richard-stallman - - -# Aliases by sudoman ; some of these may be redundant to those above. 2016-12-28 -# -# https://rt.gnu.org/Ticket/Display.html?id=1112280 - -RedirectMatch temp "^/books/?$" "/collection/books-docs" -RedirectMatch temp "^/books-docs/?$" "/collection/books-docs" - -RedirectMatch temp "^/books-docs/debugging-gdb-gnu-source-level-debugger/?$" "/books-docs/debugging-gdb-gnu-source-level-debugger-v-731" -RedirectMatch temp "^/books-docs/debugging-gdb-source-level-debugger-v-731/?$" "/books-docs/debugging-gdb-gnu-source-level-debugger-v-731" -RedirectMatch temp "^/books-docs/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" -RedirectMatch temp "^/books/emacs-245-reference-card/?$" "/books-docs/emacs-reference-card-v24" -RedirectMatch temp "^/books/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" - -RedirectMatch temp "^/collection/?$" "/" - -RedirectMatch temp "^/category/?$" "/" -RedirectMatch temp "^/category/books(/.*|$)" "/collection/books" -RedirectMatch temp "^/category/donate(/.*|$)" "/collection/donations" -RedirectMatch temp "^/category/gear/?$" "/collection/gnu-gear" -RedirectMatch temp "^/category/gnu-gear/stickers/?$" "/collection/stickers" -RedirectMatch temp "^/category/gnu-gear/individual-stickers/?$" "/collection/stickers" -RedirectMatch temp "^/category/gnu-gear(/.*|$)" "/collection/gnu-gear" -RedirectMatch temp "^/category/signed/?$" "/" -RedirectMatch temp "^/category/stickers/?$" "/collection/stickers" -RedirectMatch temp "^/category/stuffed-gnu/?$" "/gear/stuffed-baby-gnu" - -RedirectMatch temp "^/collection/books/?$" "/collection/books-docs" -RedirectMatch temp "^/collection/t-shirts-hoodies/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/donations/donations/?$" "/collection/donations" - -RedirectMatch temp "^/gear/?$" "/collection/gnu-gear" -RedirectMatch temp "^/gnu-gear/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/gear/emacs-ref/?$" "/books-docs/emacs-reference-card-v24" -RedirectMatch temp "^/gear/fsf-rally-knife/?$" "/collection/gnu-gear" -RedirectMatch temp "^/gear/gnu-emacs-mug/?$" "/gear/gnu-emacs-reference-mug" -RedirectMatch temp "^/gear/gnu-emacs-reference-mugs/?$" "/gear/gnu-emacs-reference-mug" - -RedirectMatch temp "^/product/?$" "/" -RedirectMatch temp "^/product/book_bundle/?$" "/collection/books-docs" -RedirectMatch temp "^/product/debugging-gdb/?$" "/books-docs/debugging-gdb-gnu-source-level-debugger-v-731" -RedirectMatch temp "^/product/debugging-gdb-gnu-source-level-debugger/?$" "/books-docs/debugging-gdb-gnu-source-level-debugger-v-731" - -RedirectMatch temp "^/product/donation-five/?$" "/donations/donation-fsf-5" -RedirectMatch temp "^/product/donation-ten/?$" "/donations/donation-fsf-10" -RedirectMatch temp "^/product/donation-fifteen/?$" "/donations/donation-fsf-15" -RedirectMatch temp "^/product/donation-twenty/?$" "/donations/donation-fsf-20" -RedirectMatch temp "^/product/donation-twentyfive/?$" "/donations/donation-fsf-25" -RedirectMatch temp "^/product/donation-fifty/?$" "/donations/donation-fsf-50" -RedirectMatch temp "^/product/donation-onehundred/?$" "/donations/donation-fsf-100" -RedirectMatch temp "^/product/donation-.*" "/collection/donations" - -RedirectMatch temp "^/product/drm_no_one_admitted/?$" "/tshirts-hoodies/drm-no-one-admitted" -RedirectMatch temp "^/product/DRM_No_One_Admitted_.*" "/tshirts-hoodies/drm-no-one-admitted" -RedirectMatch temp "^/product/DRM_No-One-Admitted_.*" "/tshirts-hoodies/drm-no-one-admitted" - -RedirectMatch temp "^/product/emacs_manual_23/?$" "/books/gnu-emacs-manual-17th-edition-v-245" -RedirectMatch temp "^/product/emacs_manual_24/?$" "/books/gnu-emacs-manual-17th-edition-v-245" -RedirectMatch temp "^/product/Emacs_Manual_24/?$" "/books/gnu-emacs-manual-17th-edition-v-245" -RedirectMatch temp "^/product/emacs_manual_26/?$" "/books/gnu-emacs-manual-18th-edition-v-261" -RedirectMatch temp "^/product/Emacs_Manual_26/?$" "/books/gnu-emacs-manual-18th-edition-v-261" - -RedirectMatch temp "^/product/emacs-reference-cards/?$" "/books-docs/emacs-reference-card-v24" -RedirectMatch temp "^/product/emacs-reference-cards_v21_1/?$" "/books-docs/emacs-reference-cards-v-21" -RedirectMatch temp "^/product/emacs-reference-cards-v-22/?$" "/books-docs/emacs-reference-card-v24" - -RedirectMatch temp "^/product/faif-ebook.*" "/collection/books-docs" -RedirectMatch temp "^/product/flex-reference-cards_10?/?$" "/books-docs/flex-version-237-reference-cards" - -RedirectMatch temp "^/product/free-as-in-freedom/?$" "/collection/books-docs" -RedirectMatch temp "^/product/free-as-in-freedom-2/?$" "/collection/books-docs" -RedirectMatch temp "^/product/FreeAsInFreedom-FrenchSigned/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/free-software-free-society/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" -RedirectMatch temp "^/product/free-software-free-society-2/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" -RedirectMatch temp "^/product/free-software-free-society-3-hardcover/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" -RedirectMatch temp "^/product/free-software-free-society-3-paperback/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" - -RedirectMatch temp "^/product/free-software-free-society-shirt-light-maroon/?$" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-maroon/?$" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-maroon_.*" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-natural/?$" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-natural_.*" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-white/?$" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-white_.*" "/tshirts-hoodies/free-software-free-society-shirt" - -RedirectMatch temp "^/product/fsf-30-shirt/?$" "/tshirts-hoodies/fsf-30-shirt" -RedirectMatch temp "^/product/fsf-30-shirt-.*" "/tshirts-hoodies/fsf-30-shirt" - -RedirectMatch temp "^/product/fsf-knife/?$" "/collection/gnu-gear" -RedirectMatch temp "^/product/fsf-small-knife/?$" "/collection/gnu-gear" -RedirectMatch temp "^/product/fsf-small-knife-b/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/product/fsf-polo-shirt/?$" "/tshirts-hoodies/fsf-polo-shirt" -RedirectMatch temp "^/product/fsf-polo-shirt_.*" "/tshirts-hoodies/fsf-polo-shirt" - -RedirectMatch temp "^/product/FSFS_Hoodie/?$" "https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie" -RedirectMatch temp "^/product/FSFS_Hoodie_.*" "https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie" -RedirectMatch temp "^/product/fsfs-hoodie/?$" "https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie" -RedirectMatch temp "^/product/fsfs-hoodie-.*" "https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie" - -RedirectMatch temp "^/product/gnu-c-library-application-fundamentals/?$" "/collection/books-docs" -RedirectMatch temp "^/product/gnu-c-library-book-bundle/?$" "/collection/books-docs" -RedirectMatch temp "^/product/gnu-c-library-system-network-applications/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/gnu-emacs-manual-16th-edition/?$" "/books/gnu-emacs-manual-17th-edition-v-245" - -RedirectMatch temp "^/product/gnuhead-grey/?$" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/product/gnuhead-grey-.*" "/tshirts-hoodies/gnu-head" - -RedirectMatch temp "^/product/gnu-head-.*" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/product/gnu_head_shirt/?$" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/product/gnu_head_shirt_.*" "/tshirts-hoodies/gnu-head" - -RedirectMatch temp "^/product/gnulinuxinside/?$" "/stickers/gnulinux-inside-sticker-pack" -RedirectMatch temp "^/product/gnu-make-version-381/?$" "/books-docs/gnu-make-version-381" -RedirectMatch temp "^/product/gnu-mdk/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/gnu-polo-shirt/?$" "/tshirts-hoodies/gnu-polo-shirt" -RedirectMatch temp "^/product/gnu-polo-shirt-.*" "/tshirts-hoodies/gnu-polo-shirt" - -RedirectMatch temp "^/product/gnu-project-20th-anniversary-shirt-.*" "/collection/gnu-gear" -RedirectMatch temp "^/product/gnu-radius-reference-manual/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/gplv3-gray-hoodie-large/?$" "/tshirts-hoodies/gplv3-hoodie" -RedirectMatch temp "^/product/gplv3-gray-hoodie-large-.*" "/tshirts-hoodies/gplv3-hoodie" - -RedirectMatch temp "^/product/gplv3_hoodie/?$" "/tshirts-hoodies/gplv3-hoodie" -RedirectMatch temp "^/product/GPLv3_Hoodie_.*" "/tshirts-hoodies/gplv3-hoodie" - -RedirectMatch temp "^/product/gplv3pin/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/product/gplv3-t-shirt-black/?$" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/gplv3-t-shirt-black_.*" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/gplv3-t-shirt-gray/?$" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/gplv3-t-shirt-gray_.*" "/tshirts-hoodies/gplv3" - -RedirectMatch temp "^/product/happy-hacking-shirt/?$" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/happy-hacking-shirt-.*" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/happy-hacking-shirt_.*" "/tshirts-hoodies/gplv3" - -RedirectMatch temp "^/product/introduction-programming-emacs-lisp/?$" "/books/signed-introduction-programming-emacs-lisp-3rd-edition" - -RedirectMatch temp "^/product/Introduction_to_Command_Line/?$" "/books-docs/introduction-command-line" -RedirectMatch temp "^/product/introduction_to_command_line/?$" "/books-docs/introduction-command-line" - -RedirectMatch temp "^/product/intro_to_emacs_lisp_3rd_ed/?$" "/books/signed-introduction-programming-emacs-lisp-3rd-edition" - -RedirectMatch temp "^/product/LibrePlanet2012Gray/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/LibrePlanet2013.*" "/tshirts-hoodies/libreplanet-2013" - -RedirectMatch temp "^/product/libreplanet-tshirt-.*" "/collection/gnu-gear" - -RedirectMatch temp "^/product/live-the-dream-.*" "/tshirts-hoodies/live-dream" -RedirectMatch temp "^/product/Live_The_Dream_.*" "/tshirts-hoodies/live-dream" - -RedirectMatch temp "^/product/LP12.*" "/tshirts-hoodies/libreplanet-2012" -RedirectMatch temp "^/product/lp15-.*" "/tshirts-hoodies/libreplanet-2015" -RedirectMatch temp "^/product/lp16-shirt-.*" "/tshirts-hoodies/libreplanet-2016" -RedirectMatch temp "^/product/lp2014/?$" "/tshirts-hoodies/libreplanet-2014" - -RedirectMatch temp "^/product/lp-button/?$" "/gear/libreplanet-button" - -RedirectMatch temp "^/product/LPT/?$" "/" -RedirectMatch temp "^/product/M/?$" "/" - -RedirectMatch temp "^/product/mediagoblin/?$" "/tshirts-hoodies/mediagoblin" -RedirectMatch temp "^/product/mediagoblin-.*" "/tshirts-hoodies/mediagoblin" -RedirectMatch temp "^/product/Mediagoblin/?$" "/tshirts-hoodies/mediagoblin" -RedirectMatch temp "^/product/Mediagoblin-.*" "/tshirts-hoodies/mediagoblin" - -RedirectMatch temp "^/product/raffleticket/?$" "/" - -RedirectMatch temp "^/product/run-gcc-.*" "/tshirts-hoodies/run-gcc-shirt" - -RedirectMatch temp "^/product/Signed_Emacs_Manual_245/?$" "/books/gnu-emacs-manual-17th-edition-v-245" - -RedirectMatch temp "^/product/signed-free-as-in-freedom/?$" "/collection/books-docs" -RedirectMatch temp "^/product/signed-free-as-in-freedom-signed/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/signed-fsfs/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" - -RedirectMatch temp "^/product/stuffed-gnu/?$" "/gear/stuffed-baby-gnu" - -RedirectMatch temp "^/product/super-stic/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/product/Thanx_Gnu/?$" "/tshirts-hoodies/thanx-gnu" -RedirectMatch temp "^/product/Thanx_Gnu_.*" "/tshirts-hoodies/thanx-gnu" - -RedirectMatch temp "^/product/usb/?$" "/storage-devices/neug-usb-true-random-number-generator" - -RedirectMatch temp "^/product/using-gcc-gnu-compiler-collection-reference/?$" "/books-docs/using-gcc-gnu-compiler-collection-reference-manual-v-33-discounted" -RedirectMatch temp "^/product/using-gcc-gnu-compiler-collection-reference-manual/?$" "/books-docs/using-gcc-gnu-compiler-collection-reference-manual-v-33-discounted" - -RedirectMatch temp "^/tshirts-hoodies/?$" "/collection/gnu-gear" -RedirectMatch temp "^/tshirts-hoodies/gnu-head[.]/?$" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/tshirts-hoodies/gnu-head-0/?$" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/tshirts-hoodies/gnuhead-grey/?$" "/tshirts-hoodies/gnu-head" - -RedirectMatch temp "^/tshirts-hoodies/libreplanet-2016-t-shirt/?$" "/tshirts-hoodies/libreplanet-2016" - diff --git a/drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common~ b/drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common~ deleted file mode 100644 index d9157cf..0000000 --- a/drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common~ +++ /dev/null @@ -1,81 +0,0 @@ - RedirectPermanent /favicon.ico http://static.fsf.org/store/img/favicon.ico - RedirectPermanent /product/free-software-free-society https://shop.fsf.org/product/free-software-free-society-2 - - -# Cf. #793226. Ward, 2013-01-23 - RedirectPermanent /product/emacs-manual https://shop.fsf.org/product/Emacs_Manual_24 - RedirectPermanent /product/intro-to-emacs-lisp https://shop.fsf.org/product/Intro_to_Emacs_Lisp_3rd_Ed - RedirectPermanent /product/debugging-with-gdb https://shop.fsf.org/product/debugging-gdb-gnu-source-level-debugger-10 - RedirectPermanent /product/gnu-make https://shop.fsf.org/product/gnu-make-version-381 - RedirectPermanent /category/donate/ https://donate.fsf.org - -# RT 1092489 k054, 2016-03-10 - RedirectPermanent /product/Emacs_Manual/ https://shop.fsf.org/product/Emacs_Manual_245/ - RedirectPermanent /product/Emacs_Manual_24/ https://shop.fsf.org/product/Emacs_Manual_245/ - -#Redirects from old to new shop 2016-04-25 -Redirect /product/emacs-reference-card-v24 https://shop.fsf.org/books-docs/emacs-reference-card-v24 -Redirect /product/emacs-reference-cards-21 https://shop.fsf.org/books-docs/emacs-reference-cards-v-21 -Redirect /product/flex-reference-cards https://shop.fsf.org/books-docs/flex-version-237-reference-cards -Redirect /product/Emacs_Manual_245 https://shop.fsf.org/books/gnu-emacs-manual-17th-edition-v-245 -Redirect /product/debugging-gdb-gnu-source-level-debugger-10 https://shop.fsf.org/books-docs/debugging-gdb-gnu-source-level-debugger-v-731 -Redirect /product/free-software-free-society-2 https://shop.fsf.org/books/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition -Redirect /product/gnu-make-version-381 https://shop.fsf.org/books-docs/gnu-make-version-381 -Redirect /product/bison-manual https://shop.fsf.org/books-docs/bison-manual-v-1875-discounted -Redirect /product/using-gcc-gnu-compiler-collection-reference-manual https://shop.fsf.org/books-docs/using-gcc-gnu-compiler-collection-reference-manual-v-33-discounted -Redirect /product/Intro_to_Emacs_Lisp_3rd_Ed https://shop.fsf.org/books/signed-introduction-programming-emacs-lisp-3rd-edition -Redirect /product/free-software-free-society-3-hardcover https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/free-software-free-society-3-paperback https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/Introduction_to_Command_Line https://shop.fsf.org/books-docs/introduction-command-line -Redirect /product/GNU_cap https://shop.fsf.org/sites/default/files/styles/product_medium/public/productimage-picture-gnu_cap-151.jpg?itok=ubzO0cM8 -Redirect /product/fsf-small-knife https://shop.fsf.org/gear/fsf-rally-knife -Redirect /product/gnulinuxinside https://shop.fsf.org/stickers/gnulinux-inside-sticker-pack -Redirect /product/lp15 https://shop.fsf.org/tshirts-hoodies/libreplanet-2015 -Redirect /product/usb https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator -Redirect /product/signed-rms-photo-print https://shop.fsf.org/wall-art/signed-rms-photo-print -Redirect /product/DRM_No_One_Admitted https://shop.fsf.org/tshirts-hoodies/drm-no-one-admittedgreen -Redirect /product/fsf-30-shirt https://shop.fsf.org/tshirts-hoodies/fsf-30-shirt -Redirect /product/FSFS_Hoodie https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie -Redirect /product/free-software-free-society-shirt-maroon https://shop.fsf.org/tshirts-hoodies/free-software-free-society-shirt -Redirect /product/gnu-polo-shirt https://shop.fsf.org/tshirts-hoodies/gnu-polo-shirt -Redirect /product/gnuhead-grey https://shop.fsf.org/tshirts-hoodies/gnuhead-grey -Redirect /product/gplv3-gray-hoodie https://shop.fsf.org/tshirts-hoodies/gplv3-hoodie -Redirect /product/GPLv3_Hoodie https://shop.fsf.org/tshirts-hoodies/gplv3-hoodie -Redirect /product/LibrePlanet2012Yellow https://shop.fsf.org/tshirts-hoodies/libreplanet-2012 -Redirect /product/lp16 https://shop.fsf.org/tshirts-hoodies/libreplanet-2016-t-shirt -Redirect /product/Live_The_Dream https://shop.fsf.org/tshirts-hoodies/live-dream -Redirect /product/Mediagoblin https://shop.fsf.org/tshirts-hoodies/mediagoblin -Redirect /product/run-gcc-shirt https://shop.fsf.org/tshirts-hoodies/run-gcc-shirt -Redirect /product/Thanx_Gnu https://shop.fsf.org/tshirts-hoodies/thanx-gnu -Redirect /product/mediagoblin-black https://shop.fsf.org/tshirts-hoodies/mediagoblin-black -Redirect /product/FSF-Polo-Shirt https://shop.fsf.org/tshirts-hoodies/fsf-polo-shirt -Redirect /product/Gnu_Head_shirt https://shop.fsf.org/tshirts-hoodies/gnu-head -Redirect /product/lp-tshirt https://shop.fsf.org/tshirts-hoodies/libreplanet -Redirect /product/Libreplanet2013 https://shop.fsf.org/tshirts-hoodies/libreplanet-2013 -Redirect /product/gplv3-t-shirt-black https://shop.fsf.org/tshirts-hoodies/gplv3 -Redirect /product/gplv3-t-shirt-gray https://shop.fsf.org/tshirts-hoodies/gplv3 -Redirect /product/happy-hacking-shirt https://shop.fsf.org/tshirts-hoodies/happy-hacking-t-shirt -Redirect /product/gnu-beanie https://shop.fsf.org/tshirts-hoodies/gnu-beanie -Redirect /product/gnu-20th-annv-leather-keychain https://shop.fsf.org/gear/gnu-20th-anniversary-leather-keychain -Redirect /product/gnu-30-travel-mug https://shop.fsf.org/gear/gnu-30-travel-mug -Redirect /product/gnu-emblem-leather-keychain https://shop.fsf.org/gear/gnu-emblem-leather-keychain -Redirect /product/gnu-emacs-reference-mugs https://shop.fsf.org/gear/gnu-emacs-reference-mugs -Redirect /product/stuffed-baby-gnu https://shop.fsf.org/gear/stuffed-baby-gnu -Redirect /product/button-grab-bag https://shop.fsf.org/gear/button-grab-bag -Redirect /product/gnu-emblem-classic-pin https://shop.fsf.org/gear/gnu-emblem-classic-pin -Redirect /product/run-gcc-sticker https://shop.fsf.org/stickers/run-gcc-sticker -Redirect /product/super-sticker-mega-multi-pack https://shop.fsf.org/stickers/super-sticker-mega-multi-pack -Redirect /product/free-software-free-society-3-hardcover-signed https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/Signed_Intro_to_Emacs_Lisp_3rd_Ed https://shop.fsf.org/books/signed-introduction-programming-emacs-lisp-3rd-edition - - - - -Redirect /tshirts-hoodies/drm-no-one-admittedgreen https://shop.fsf.org/tshirts-hoodies/drm-no-one-admitted - - - -Redirect /books/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition - - -Redirect https://shop.fsf.org/product/free-as-in-freedom-2 https://shop.fsf.org/books/free-freedom-20-richard-stallman \ No newline at end of file diff --git a/drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf b/drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf deleted file mode 100644 index 6ce41b5..0000000 --- a/drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf +++ /dev/null @@ -1,74 +0,0 @@ -################################################################## - - ServerName shopserver0p.fsf.org - ServerAlias shop.fsf.org - ServerAlias store.fsf.org - ServerAdmin webmaster@localhost - DocumentRoot /var/www/shopserver0p.fsf.org - RewriteEngine on - RewriteCond %{HTTPS} off - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} - ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log - CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined - -################################################################## - -################################################################## - - ServerName shopserver0p.fsf.org - ServerAlias shop.fsf.org - ServerAlias store.fsf.org - DocumentRoot /var/www/shopserver0p.fsf.org - RewriteEngine On - ServerSignature On - AddType image/x-icon .ico - SSLEngine on - - include /etc/apache2/sites-available/ssl-common.conf - - SSLCertificateFile /etc/letsencrypt/live/shopserver0p.fsf.org/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/shopserver0p.fsf.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/shopserver0p.fsf.org/chain.pem - - - Order deny,allow - Deny from all - Allow from 74.94.156.210 74.94.156.211 - - - - - Options Indexes FollowSymLinks MultiViews - AllowOverride All - Satisfy all - Order deny,allow - allow from all - #allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - Alias /shop-reports /srv/shop-reports - - AllowOverride none - Order deny,allow - allow from all - #Deny from all - #Allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - - Order deny,allow - Deny from all - Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193 - - Include /etc/apache2/sites-available/shop.fsf.org-common - - - ErrorDocument 403 /403.html - - LogFormat "%{X-Forwarded-for}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" cached - - ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log - CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined - - -################################################################## diff --git a/drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf~ b/drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf~ deleted file mode 100644 index 3678d00..0000000 --- a/drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf~ +++ /dev/null @@ -1,55 +0,0 @@ -################################################################## - - ServerName shopserver0p.fsf.org - ServerAlias shop.fsf.org - ServerAlias store.fsf.org - ServerAdmin webmaster@localhost - DocumentRoot /var/www/shopserver0p.fsf.org - RewriteEngine on - RewriteCond %{HTTPS} off - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} - ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log - CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined - -################################################################## - -################################################################## - - ServerName shopserver0p.fsf.org - ServerAlias shop.fsf.org - ServerAlias store.fsf.org - DocumentRoot /var/www/shopserver0p.fsf.org - RewriteEngine On - ServerSignature On - AddType image/x-icon .ico - SSLEngine on - - include /etc/apache2/sites-available/ssl-common.conf - - SSLCertificateFile /etc/letsencrypt/live/shopserver0p.fsf.org/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/shopserver0p.fsf.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/shopserver0p.fsf.org/chain.pem - - - - Options Indexes FollowSymLinks MultiViews - AllowOverride All - Satisfy all - Order deny,allow - allow from all - #allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - - Include /etc/apache2/sites-available/shop.fsf.org-common - - - ErrorDocument 403 /403.html - - LogFormat "%{X-Forwarded-for}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" cached - - ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log - CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined - - -################################################################## diff --git a/drupal-configs/shopserver/apache2/sites-available/ssl-common.conf b/drupal-configs/shopserver/apache2/sites-available/ssl-common.conf deleted file mode 100644 index 38af572..0000000 --- a/drupal-configs/shopserver/apache2/sites-available/ssl-common.conf +++ /dev/null @@ -1,24 +0,0 @@ - -# Disable SSLv2 (BEAST) SSLv3 (POODLE) and TLS < 1.2 (PCI compliance) -SSLProtocol ALL -SSLv2 -SSLv3 -TLSv1 -TLSv1.1 - -# PFS -# Current recommend list from https://cipherli.st -SSLHonorCipherOrder on -SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH - -# HSTS -Header always set Strict-Transport-Security "max-age=63072000" - -# Security Headers -#Header always set X-Frame-Options DENY -#Header always set X-Content-Type-Options nosniff - -# Apache2 >= 2.4 only: -# OCSP Stapling - -SSLCompression off -# Disable for now, requires apache 2.4.12 (trisquel 8?) -#SSLSessionTickets Off -SSLUseStapling on - diff --git a/drupal-configs/shopserver/apache2/sites-available/ssl-common.conf.cfsaved b/drupal-configs/shopserver/apache2/sites-available/ssl-common.conf.cfsaved deleted file mode 100644 index 139d56b..0000000 --- a/drupal-configs/shopserver/apache2/sites-available/ssl-common.conf.cfsaved +++ /dev/null @@ -1,25 +0,0 @@ - -# Disable SSLv2 (BEAST) and SSLv3 (POODLE) -SSLProtocol ALL -SSLv2 -SSLv3 -TLSv1 -TLSv1.1 - -# PFS -# Current recommend list from https://cipherli.st -SSLHonorCipherOrder on -SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH - -# HSTS -Header always set Strict-Transport-Security "max-age=63072000" - -# Security Headers -#Header always set X-Frame-Options DENY -#Header always set X-Content-Type-Options nosniff - -# Apache2 >= 2.4 only: -# OCSP Stapling - -SSLCompression off -# Disable for now, requires apache 2.4.12 (trisquel 8?) -#SSLSessionTickets Off -#SSLUseStapling on - - diff --git a/drupal-configs/shopserver/apache2/sites-enabled/01-shopserver0p.fsf.org.conf b/drupal-configs/shopserver/apache2/sites-enabled/01-shopserver0p.fsf.org.conf deleted file mode 100644 index 42e0410..0000000 --- a/drupal-configs/shopserver/apache2/sites-enabled/01-shopserver0p.fsf.org.conf +++ /dev/null @@ -1,76 +0,0 @@ -################################################################## - - ServerName shopserver0p.fsf.org - ServerAlias shop.fsf.org - ServerAlias store.fsf.org - ServerAdmin webmaster@localhost - DocumentRoot /var/www/shopserver0p.fsf.org - RewriteEngine on - RewriteCond %{HTTPS} off - RewriteCond %{REQUEST_URI} !=/server-status - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} - ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log - CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined - -################################################################## - -################################################################## - - ServerName shopserver0p.fsf.org - ServerAlias shop.fsf.org - ServerAlias store.fsf.org - DocumentRoot /var/www/shopserver0p.fsf.org - RewriteEngine On - ServerSignature On - AddType image/x-icon .ico - SSLEngine on - - include /etc/apache2/sites-available/ssl-common.conf - - SSLCertificateFile /etc/letsencrypt/live/shop.fsf.org/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/shop.fsf.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/shop.fsf.org/chain.pem - - - - Options Indexes FollowSymLinks MultiViews - AllowOverride All - Satisfy all - Order deny,allow - allow from all - #allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - Alias /shop-reports /srv/shop-reports - - AllowOverride none - Order deny,allow - allow from all - #Deny from all - #Allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - - Order deny,allow - Deny from all - Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193 - - - - Order deny,allow - Deny from all - Allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - Include /etc/apache2/sites-available/shop.fsf.org-common - - - ErrorDocument 403 /403.html - - LogFormat "%{X-Forwarded-for}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" cached - - ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log - CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined - - -################################################################## diff --git a/drupal-configs/shopserver/apache2/sites-enabled/02-gnupress.org.conf b/drupal-configs/shopserver/apache2/sites-enabled/02-gnupress.org.conf deleted file mode 100644 index a002282..0000000 --- a/drupal-configs/shopserver/apache2/sites-enabled/02-gnupress.org.conf +++ /dev/null @@ -1,39 +0,0 @@ -################################################################## - - ServerName gnupress.org - ServerAlias gnupress.com - ServerAlias www.gnupress.org - ServerAlias www.gnupress.com - ServerAdmin webmaster@localhost - - Include /etc/apache2/sites-available/gnupress.org-common - - ErrorLog /var/log/apache2/http-gnupress.org.error.log - CustomLog /var/log/apache2/http-gnupress.org.access.log combined - -################################################################## - -################################################################## - - ServerName gnupress.org - ServerAlias gnupress.com - ServerAlias www.gnupress.org - ServerAlias www.gnupress.com - ServerAdmin webmaster@localhost - - SSLEngine on - - include /etc/apache2/sites-available/ssl-common.conf - - SSLCertificateFile /etc/letsencrypt/live/shop.fsf.org/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/shop.fsf.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/shop.fsf.org/chain.pem - - - Include /etc/apache2/sites-available/gnupress.org-common - - - ErrorLog /var/log/apache2/http-gnupress.org.error.log - CustomLog /var/log/apache2/http-gnupress.org.access.log combined - -################################################################## diff --git a/drupal-configs/shopserver/conf b/drupal-configs/shopserver/conf deleted file mode 100644 index 3b800fa..0000000 --- a/drupal-configs/shopserver/conf +++ /dev/null @@ -1,308 +0,0 @@ - - Order deny,allow - Deny from all - Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193 - - - - Order deny,allow - Deny from all - Allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - -RedirectPermanent /favicon.ico http://static.fsf.org/store/img/favicon.ico -RedirectPermanent /product/free-software-free-society https://shop.fsf.org/product/free-software-free-society-2 - -# Cf. #793226. Ward, 2013-01-23 -Redirect /product/emacs-manual https://shop.fsf.org/product/emacs_manual_26 -Redirect /product/intro-to-emacs-lisp https://shop.fsf.org/product/Intro_to_Emacs_Lisp_3rd_Ed -Redirect /product/debugging-with-gdb https://shop.fsf.org/product/debugging-gdb-gnu-source-level-debugger-10 -Redirect /product/gnu-make https://shop.fsf.org/product/gnu-make-version-381 -# de-activating: using internal donation system - sudoman 2017-01-13 -#RedirectPermanent /category/donate/ https://donate.fsf.org - -# RT 1092489 k054, 2016-03-10 -RedirectPermanent /product/Emacs_Manual/ https://shop.fsf.org/product/Emacs_Manual_245/ -RedirectPermanent /product/Emacs_Manual_24/ https://shop.fsf.org/product/Emacs_Manual_245/ - -#Redirects from old to new shop 2016-04-25 -## eostre - 2020-09-23 - commented out borked links, some of these 403, some 404, some just get redirected to the shop.fsf.org homepage -Redirect /product/emacs-reference-card-v24 https://shop.fsf.org/books-docs/emacs-reference-card-v24 -Redirect /product/emacs-reference-cards-21 https://shop.fsf.org/books-docs/emacs-reference-cards-v-21 -Redirect /product/flex-reference-cards https://shop.fsf.org/books-docs/flex-version-237-reference-cards -Redirect /product/Emacs_Manual_245 https://shop.fsf.org/books/gnu-emacs-manual-17th-edition-v-245 -Redirect /product/debugging-gdb-gnu-source-level-debugger-10 https://shop.fsf.org/books-docs/debugging-gdb-gnu-source-level-debugger-v-731 -Redirect /product/free-software-free-society-2 https://shop.fsf.org/books/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition -Redirect /product/gnu-make-version-381 https://shop.fsf.org/books-docs/gnu-make-version-381 -Redirect /product/bison-manual https://shop.fsf.org/books-docs/bison-manual-v-1875-discounted -Redirect /product/using-gcc-gnu-compiler-collection-reference-manual https://shop.fsf.org/books-docs/using-gcc-gnu-compiler-collection-reference-manual-v-33-discounted -Redirect /product/Intro_to_Emacs_Lisp_3rd_Ed https://shop.fsf.org/books/signed-introduction-programming-emacs-lisp-3rd-edition -Redirect /product/free-software-free-society-3-hardcover https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/free-software-free-society-3-paperback https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/Introduction_to_Command_Line https://shop.fsf.org/books-docs/introduction-command-line -#Redirect /product/GNU_cap https://shop.fsf.org/sites/default/files/styles/product_medium/public/productimage-picture-gnu_cap-151.jpg?itok=ubzO0cM8 -#Redirect /product/fsf-small-knife https://shop.fsf.org/gear/fsf-rally-knife -Redirect /product/gnulinuxinside https://shop.fsf.org/stickers/gnulinux-inside-sticker-pack -Redirect /product/lp15 https://shop.fsf.org/tshirts-hoodies/libreplanet-2015 -Redirect /product/usb https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator -#Redirect /product/signed-rms-photo-print https://shop.fsf.org/wall-art/signed-rms-photo-print -Redirect /product/DRM_No_One_Admitted https://shop.fsf.org/tshirts-hoodies/drm-no-one-admittedgreen -Redirect /product/fsf-30-shirt https://shop.fsf.org/tshirts-hoodies/fsf-30-shirt -Redirect /product/FSFS_Hoodie https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie -Redirect /product/free-software-free-society-shirt-maroon https://shop.fsf.org/tshirts-hoodies/free-software-free-society-shirt -Redirect /product/gnu-polo-shirt https://shop.fsf.org/tshirts-hoodies/gnu-polo-shirt -Redirect /product/gnuhead-grey https://shop.fsf.org/tshirts-hoodies/gnuhead-grey -#Redirect /product/gplv3-gray-hoodie https://shop.fsf.org/tshirts-hoodies/gplv3-hoodie -#Redirect /product/GPLv3_Hoodie https://shop.fsf.org/tshirts-hoodies/gplv3-hoodie -Redirect /product/LibrePlanet2012Yellow https://shop.fsf.org/tshirts-hoodies/libreplanet-2012 -Redirect /product/lp16 https://shop.fsf.org/tshirts-hoodies/libreplanet-2016-t-shirt -Redirect /product/Live_The_Dream https://shop.fsf.org/tshirts-hoodies/live-dream -Redirect /product/Mediagoblin https://shop.fsf.org/tshirts-hoodies/mediagoblin -Redirect /product/run-gcc-shirt https://shop.fsf.org/tshirts-hoodies/run-gcc-shirt -#Redirect /product/Thanx_Gnu https://shop.fsf.org/tshirts-hoodies/thanx-gnu -Redirect /product/mediagoblin-black https://shop.fsf.org/tshirts-hoodies/mediagoblin-black -Redirect /product/FSF-Polo-Shirt https://shop.fsf.org/tshirts-hoodies/fsf-polo-shirt -Redirect /product/Gnu_Head_shirt https://shop.fsf.org/tshirts-hoodies/gnu-head -Redirect /product/lp-tshirt https://shop.fsf.org/tshirts-hoodies/libreplanet -#Redirect /product/Libreplanet2013 https://shop.fsf.org/tshirts-hoodies/libreplanet-2013 -Redirect /product/gplv3-t-shirt-black https://shop.fsf.org/tshirts-hoodies/gplv3 -Redirect /product/gplv3-t-shirt-gray https://shop.fsf.org/tshirts-hoodies/gplv3 -Redirect /product/happy-hacking-shirt https://shop.fsf.org/tshirts-hoodies/happy-hacking-t-shirt -Redirect /product/gnu-beanie https://shop.fsf.org/tshirts-hoodies/gnu-beanie -Redirect /product/gnu-20th-annv-leather-keychain https://shop.fsf.org/gear/gnu-20th-anniversary-leather-keychain -Redirect /product/gnu-30-travel-mug https://shop.fsf.org/gear/gnu-30-travel-mug -Redirect /product/gnu-emblem-leather-keychain https://shop.fsf.org/gear/gnu-emblem-leather-keychain -Redirect /product/gnu-emacs-reference-mugs https://shop.fsf.org/gear/gnu-emacs-reference-mugs -Redirect /product/stuffed-baby-gnu https://shop.fsf.org/gear/stuffed-baby-gnu -Redirect /product/button-grab-bag https://shop.fsf.org/gear/button-grab-bag -Redirect /product/gnu-emblem-classic-pin https://shop.fsf.org/gear/gnu-emblem-classic-pin -Redirect /product/run-gcc-sticker https://shop.fsf.org/stickers/run-gcc-sticker -Redirect /product/super-sticker-mega-multi-pack https://shop.fsf.org/stickers/super-sticker-mega-multi-pack -Redirect /product/free-software-free-society-3-hardcover-signed https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition -Redirect /product/Signed_Intro_to_Emacs_Lisp_3rd_Ed https://shop.fsf.org/books/signed-introduction-programming-emacs-lisp-3rd-edition -Redirect /tshirts-hoodies/emacs-logo-t-shirt https://shop.fsf.org/tshirts-hoodies/gnu-emacs-logo-t-shirt - - -Redirect /tshirts-hoodies/drm-no-one-admittedgreen https://shop.fsf.org/tshirts-hoodies/drm-no-one-admitted - -Redirect /books/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition - -Redirect /product/free-as-in-freedom-2 https://shop.fsf.org/books/free-freedom-20-richard-stallman - - -# Aliases by sudoman ; some of these may be redundant to those above. 2016-12-28 -# -# https://rt.gnu.org/Ticket/Display.html?id=1112280 - -RedirectMatch temp "^/books/?$" "/collection/books-docs" -RedirectMatch temp "^/books-docs/?$" "/collection/books-docs" - -RedirectMatch temp "^/books-docs/debugging-gdb-gnu-source-level-debugger/?$" "/books-docs/debugging-gdb-gnu-source-level-debugger-v-731" -RedirectMatch temp "^/books-docs/debugging-gdb-source-level-debugger-v-731/?$" "/books-docs/debugging-gdb-gnu-source-level-debugger-v-731" -RedirectMatch temp "^/books-docs/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" -RedirectMatch temp "^/books/emacs-245-reference-card/?$" "/books-docs/emacs-reference-card-v24" -RedirectMatch temp "^/books/free-software-free-society-selected-essays-richard-m-stallman-2nd-edition/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" - -RedirectMatch temp "^/collection/?$" "/" - -RedirectMatch temp "^/category/?$" "/" -RedirectMatch temp "^/category/books(/.*|$)" "/collection/books" -RedirectMatch temp "^/category/donate(/.*|$)" "/collection/donations" -RedirectMatch temp "^/category/gear/?$" "/collection/gnu-gear" -RedirectMatch temp "^/category/gnu-gear/stickers/?$" "/collection/stickers" -RedirectMatch temp "^/category/gnu-gear/individual-stickers/?$" "/collection/stickers" -RedirectMatch temp "^/category/gnu-gear(/.*|$)" "/collection/gnu-gear" -RedirectMatch temp "^/category/signed/?$" "/" -RedirectMatch temp "^/category/stickers/?$" "/collection/stickers" -RedirectMatch temp "^/category/stuffed-gnu/?$" "/gear/stuffed-baby-gnu" - -RedirectMatch temp "^/collection/books/?$" "/collection/books-docs" -RedirectMatch temp "^/collection/t-shirts-hoodies/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/donations/donations/?$" "/collection/donations" - -RedirectMatch temp "^/gear/?$" "/collection/gnu-gear" -RedirectMatch temp "^/gnu-gear/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/gear/emacs-ref/?$" "/books-docs/emacs-reference-card-v24" -RedirectMatch temp "^/gear/fsf-rally-knife/?$" "/collection/gnu-gear" -RedirectMatch temp "^/gear/gnu-emacs-mug/?$" "/gear/gnu-emacs-reference-mug" -RedirectMatch temp "^/gear/gnu-emacs-reference-mugs/?$" "/gear/gnu-emacs-reference-mug" - -RedirectMatch temp "^/product/?$" "/" -RedirectMatch temp "^/product/book_bundle/?$" "/collection/books-docs" -RedirectMatch temp "^/product/debugging-gdb/?$" "/books-docs/debugging-gdb-gnu-source-level-debugger-v-731" -RedirectMatch temp "^/product/debugging-gdb-gnu-source-level-debugger/?$" "/books-docs/debugging-gdb-gnu-source-level-debugger-v-731" - -RedirectMatch temp "^/product/donation-five/?$" "/donations/donation-fsf-5" -RedirectMatch temp "^/product/donation-ten/?$" "/donations/donation-fsf-10" -RedirectMatch temp "^/product/donation-fifteen/?$" "/donations/donation-fsf-15" -RedirectMatch temp "^/product/donation-twenty/?$" "/donations/donation-fsf-20" -RedirectMatch temp "^/product/donation-twentyfive/?$" "/donations/donation-fsf-25" -RedirectMatch temp "^/product/donation-fifty/?$" "/donations/donation-fsf-50" -RedirectMatch temp "^/product/donation-onehundred/?$" "/donations/donation-fsf-100" -RedirectMatch temp "^/product/donation-.*" "/collection/donations" - -RedirectMatch temp "^/product/drm_no_one_admitted/?$" "/tshirts-hoodies/drm-no-one-admitted" -RedirectMatch temp "^/product/DRM_No_One_Admitted_.*" "/tshirts-hoodies/drm-no-one-admitted" -RedirectMatch temp "^/product/DRM_No-One-Admitted_.*" "/tshirts-hoodies/drm-no-one-admitted" - -RedirectMatch temp "^/product/emacs_manual_23/?$" "/books/gnu-emacs-manual-17th-edition-v-245" -RedirectMatch temp "^/product/emacs_manual_24/?$" "/books/gnu-emacs-manual-17th-edition-v-245" -RedirectMatch temp "^/product/Emacs_Manual_24/?$" "/books/gnu-emacs-manual-17th-edition-v-245" -RedirectMatch temp "^/product/emacs_manual_26/?$" "/books/gnu-emacs-manual-18th-edition-v-261" -RedirectMatch temp "^/product/Emacs_Manual_26/?$" "/books/gnu-emacs-manual-18th-edition-v-261" - -RedirectMatch temp "^/product/emacs-reference-cards/?$" "/books-docs/emacs-reference-card-v24" -RedirectMatch temp "^/product/emacs-reference-cards_v21_1/?$" "/books-docs/emacs-reference-cards-v-21" -RedirectMatch temp "^/product/emacs-reference-cards-v-22/?$" "/books-docs/emacs-reference-card-v24" - -RedirectMatch temp "^/product/faif-ebook.*" "/collection/books-docs" -RedirectMatch temp "^/product/flex-reference-cards_10?/?$" "/books-docs/flex-version-237-reference-cards" - -RedirectMatch temp "^/product/free-as-in-freedom/?$" "/collection/books-docs" -RedirectMatch temp "^/product/free-as-in-freedom-2/?$" "/collection/books-docs" -RedirectMatch temp "^/product/FreeAsInFreedom-FrenchSigned/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/free-software-free-society/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" -RedirectMatch temp "^/product/free-software-free-society-2/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" -RedirectMatch temp "^/product/free-software-free-society-3-hardcover/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" -RedirectMatch temp "^/product/free-software-free-society-3-paperback/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" - -RedirectMatch temp "^/product/free-software-free-society-shirt-light-maroon/?$" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-maroon/?$" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-maroon_.*" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-natural/?$" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-natural_.*" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-white/?$" "/tshirts-hoodies/free-software-free-society-shirt" -RedirectMatch temp "^/product/free-software-free-society-shirt-white_.*" "/tshirts-hoodies/free-software-free-society-shirt" - -RedirectMatch temp "^/product/fsf-30-shirt/?$" "/tshirts-hoodies/fsf-30-shirt" -RedirectMatch temp "^/product/fsf-30-shirt-.*" "/tshirts-hoodies/fsf-30-shirt" - -RedirectMatch temp "^/product/fsf-knife/?$" "/collection/gnu-gear" -RedirectMatch temp "^/product/fsf-small-knife/?$" "/collection/gnu-gear" -RedirectMatch temp "^/product/fsf-small-knife-b/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/product/fsf-polo-shirt/?$" "/tshirts-hoodies/fsf-polo-shirt" -RedirectMatch temp "^/product/fsf-polo-shirt_.*" "/tshirts-hoodies/fsf-polo-shirt" - -RedirectMatch temp "^/product/FSFS_Hoodie/?$" "https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie" -RedirectMatch temp "^/product/FSFS_Hoodie_.*" "https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie" -RedirectMatch temp "^/product/fsfs-hoodie/?$" "https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie" -RedirectMatch temp "^/product/fsfs-hoodie-.*" "https://shop.fsf.org/tshirts-hoodies/fsfs-hoodie" - -RedirectMatch temp "^/product/gnu-c-library-application-fundamentals/?$" "/collection/books-docs" -RedirectMatch temp "^/product/gnu-c-library-book-bundle/?$" "/collection/books-docs" -RedirectMatch temp "^/product/gnu-c-library-system-network-applications/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/gnu-emacs-manual-16th-edition/?$" "/books/gnu-emacs-manual-17th-edition-v-245" - -RedirectMatch temp "^/product/gnuhead-grey/?$" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/product/gnuhead-grey-.*" "/tshirts-hoodies/gnu-head" - -RedirectMatch temp "^/product/gnu-head-.*" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/product/gnu_head_shirt/?$" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/product/gnu_head_shirt_.*" "/tshirts-hoodies/gnu-head" - -RedirectMatch temp "^/product/gnulinuxinside/?$" "/stickers/gnulinux-inside-sticker-pack" -RedirectMatch temp "^/product/gnu-make-version-381/?$" "/books-docs/gnu-make-version-381" -RedirectMatch temp "^/product/gnu-mdk/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/gnu-polo-shirt/?$" "/tshirts-hoodies/gnu-polo-shirt" -RedirectMatch temp "^/product/gnu-polo-shirt-.*" "/tshirts-hoodies/gnu-polo-shirt" - -RedirectMatch temp "^/product/gnu-project-20th-anniversary-shirt-.*" "/collection/gnu-gear" -RedirectMatch temp "^/product/gnu-radius-reference-manual/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/gplv3-gray-hoodie-large/?$" "/tshirts-hoodies/gplv3-hoodie" -RedirectMatch temp "^/product/gplv3-gray-hoodie-large-.*" "/tshirts-hoodies/gplv3-hoodie" - -RedirectMatch temp "^/product/gplv3_hoodie/?$" "/tshirts-hoodies/gplv3-hoodie" -RedirectMatch temp "^/product/GPLv3_Hoodie_.*" "/tshirts-hoodies/gplv3-hoodie" - -RedirectMatch temp "^/product/gplv3pin/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/product/gplv3-t-shirt-black/?$" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/gplv3-t-shirt-black_.*" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/gplv3-t-shirt-gray/?$" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/gplv3-t-shirt-gray_.*" "/tshirts-hoodies/gplv3" - -RedirectMatch temp "^/product/happy-hacking-shirt/?$" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/happy-hacking-shirt-.*" "/tshirts-hoodies/gplv3" -RedirectMatch temp "^/product/happy-hacking-shirt_.*" "/tshirts-hoodies/gplv3" - -RedirectMatch temp "^/product/introduction-programming-emacs-lisp/?$" "/books/signed-introduction-programming-emacs-lisp-3rd-edition" - -RedirectMatch temp "^/product/Introduction_to_Command_Line/?$" "/books-docs/introduction-command-line" -RedirectMatch temp "^/product/introduction_to_command_line/?$" "/books-docs/introduction-command-line" - -RedirectMatch temp "^/product/intro_to_emacs_lisp_3rd_ed/?$" "/books/signed-introduction-programming-emacs-lisp-3rd-edition" - -RedirectMatch temp "^/product/LibrePlanet2012Gray/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/LibrePlanet2013.*" "/tshirts-hoodies/libreplanet-2013" - -RedirectMatch temp "^/product/libreplanet-tshirt-.*" "/collection/gnu-gear" - -RedirectMatch temp "^/product/live-the-dream-.*" "/tshirts-hoodies/live-dream" -RedirectMatch temp "^/product/Live_The_Dream_.*" "/tshirts-hoodies/live-dream" - -RedirectMatch temp "^/product/LP12.*" "/tshirts-hoodies/libreplanet-2012" -RedirectMatch temp "^/product/lp15-.*" "/tshirts-hoodies/libreplanet-2015" -RedirectMatch temp "^/product/lp16-shirt-.*" "/tshirts-hoodies/libreplanet-2016" -RedirectMatch temp "^/product/lp2014/?$" "/tshirts-hoodies/libreplanet-2014" - -RedirectMatch temp "^/product/lp-button/?$" "/gear/libreplanet-button" - -RedirectMatch temp "^/product/LPT/?$" "/" -RedirectMatch temp "^/product/M/?$" "/" - -RedirectMatch temp "^/product/mediagoblin/?$" "/tshirts-hoodies/mediagoblin" -RedirectMatch temp "^/product/mediagoblin-.*" "/tshirts-hoodies/mediagoblin" -RedirectMatch temp "^/product/Mediagoblin/?$" "/tshirts-hoodies/mediagoblin" -RedirectMatch temp "^/product/Mediagoblin-.*" "/tshirts-hoodies/mediagoblin" - -RedirectMatch temp "^/product/raffleticket/?$" "/" - -RedirectMatch temp "^/product/run-gcc-.*" "/tshirts-hoodies/run-gcc-shirt" - -RedirectMatch temp "^/product/Signed_Emacs_Manual_245/?$" "/books/gnu-emacs-manual-17th-edition-v-245" - -RedirectMatch temp "^/product/signed-free-as-in-freedom/?$" "/collection/books-docs" -RedirectMatch temp "^/product/signed-free-as-in-freedom-signed/?$" "/collection/books-docs" - -RedirectMatch temp "^/product/signed-fsfs/?$" "/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition" - -RedirectMatch temp "^/product/stuffed-gnu/?$" "/gear/stuffed-baby-gnu" - -RedirectMatch temp "^/product/super-stic/?$" "/collection/gnu-gear" - -RedirectMatch temp "^/product/Thanx_Gnu/?$" "/tshirts-hoodies/thanx-gnu" -RedirectMatch temp "^/product/Thanx_Gnu_.*" "/tshirts-hoodies/thanx-gnu" - -RedirectMatch temp "^/product/usb/?$" "/storage-devices/neug-usb-true-random-number-generator" - -RedirectMatch temp "^/product/using-gcc-gnu-compiler-collection-reference/?$" "/books-docs/using-gcc-gnu-compiler-collection-reference-manual-v-33-discounted" -RedirectMatch temp "^/product/using-gcc-gnu-compiler-collection-reference-manual/?$" "/books-docs/using-gcc-gnu-compiler-collection-reference-manual-v-33-discounted" - -RedirectMatch temp "^/tshirts-hoodies/?$" "/collection/gnu-gear" -RedirectMatch temp "^/tshirts-hoodies/gnu-head[.]/?$" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/tshirts-hoodies/gnu-head-0/?$" "/tshirts-hoodies/gnu-head" -RedirectMatch temp "^/tshirts-hoodies/gnuhead-grey/?$" "/tshirts-hoodies/gnu-head" - -RedirectMatch temp "^/tshirts-hoodies/libreplanet-2016-t-shirt/?$" "/tshirts-hoodies/libreplanet-2016" - - -## -## redirect root url to shop.fsf.org, otherwise redirect to gnu-press page -## https://rt.gnu.org/Ticket/Display.html?id=1239165 -## - -RedirectMatch temp ^/?$ https://shop.fsf.org/ -Redirect temp / https://www.fsf.org/gnu-press/ - -## - - - diff --git a/drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf b/drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf deleted file mode 100644 index 42e0410..0000000 --- a/drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf +++ /dev/null @@ -1,76 +0,0 @@ -################################################################## - - ServerName shopserver0p.fsf.org - ServerAlias shop.fsf.org - ServerAlias store.fsf.org - ServerAdmin webmaster@localhost - DocumentRoot /var/www/shopserver0p.fsf.org - RewriteEngine on - RewriteCond %{HTTPS} off - RewriteCond %{REQUEST_URI} !=/server-status - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} - ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log - CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined - -################################################################## - -################################################################## - - ServerName shopserver0p.fsf.org - ServerAlias shop.fsf.org - ServerAlias store.fsf.org - DocumentRoot /var/www/shopserver0p.fsf.org - RewriteEngine On - ServerSignature On - AddType image/x-icon .ico - SSLEngine on - - include /etc/apache2/sites-available/ssl-common.conf - - SSLCertificateFile /etc/letsencrypt/live/shop.fsf.org/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/shop.fsf.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/shop.fsf.org/chain.pem - - - - Options Indexes FollowSymLinks MultiViews - AllowOverride All - Satisfy all - Order deny,allow - allow from all - #allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - Alias /shop-reports /srv/shop-reports - - AllowOverride none - Order deny,allow - allow from all - #Deny from all - #Allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - - Order deny,allow - Deny from all - Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193 - - - - Order deny,allow - Deny from all - Allow from 127.0.0.1 74.94.156.210 74.94.156.211 - - - Include /etc/apache2/sites-available/shop.fsf.org-common - - - ErrorDocument 403 /403.html - - LogFormat "%{X-Forwarded-for}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" cached - - ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log - CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined - - -################################################################## diff --git a/drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf b/drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf deleted file mode 100644 index a002282..0000000 --- a/drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf +++ /dev/null @@ -1,39 +0,0 @@ -################################################################## - - ServerName gnupress.org - ServerAlias gnupress.com - ServerAlias www.gnupress.org - ServerAlias www.gnupress.com - ServerAdmin webmaster@localhost - - Include /etc/apache2/sites-available/gnupress.org-common - - ErrorLog /var/log/apache2/http-gnupress.org.error.log - CustomLog /var/log/apache2/http-gnupress.org.access.log combined - -################################################################## - -################################################################## - - ServerName gnupress.org - ServerAlias gnupress.com - ServerAlias www.gnupress.org - ServerAlias www.gnupress.com - ServerAdmin webmaster@localhost - - SSLEngine on - - include /etc/apache2/sites-available/ssl-common.conf - - SSLCertificateFile /etc/letsencrypt/live/shop.fsf.org/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/shop.fsf.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/shop.fsf.org/chain.pem - - - Include /etc/apache2/sites-available/gnupress.org-common - - - ErrorLog /var/log/apache2/http-gnupress.org.error.log - CustomLog /var/log/apache2/http-gnupress.org.access.log combined - -################################################################## -- 2.25.1