backing up shopserver1p apache config
authoreostre <eostre.danne@protonmail.com>
Fri, 16 Oct 2020 19:10:35 +0000 (15:10 -0400)
committereostre <eostre.danne@protonmail.com>
Fri, 16 Oct 2020 19:10:35 +0000 (15:10 -0400)
226 files changed:
drupal-configs/apache2/apache2.conf [moved from drupal-configs/shopserver/apache2/apache2.conf with 97% similarity]
drupal-configs/apache2/conf-available/charset.conf [moved from drupal-configs/shopserver/apache2/conf-available/charset.conf with 100% similarity]
drupal-configs/apache2/conf-available/drupal-fix-404s.conf [new file with mode: 0755]
drupal-configs/apache2/conf-available/localized-error-pages.conf [moved from drupal-configs/shopserver/apache2/conf-available/localized-error-pages.conf with 100% similarity]
drupal-configs/apache2/conf-available/other-vhosts-access-log.conf [moved from drupal-configs/shopserver/apache2/conf-available/other-vhosts-access-log.conf with 100% similarity]
drupal-configs/apache2/conf-available/php7.2-fpm.conf [new file with mode: 0644]
drupal-configs/apache2/conf-available/security.conf [moved from drupal-configs/shopserver/apache2/conf-available/security.conf with 98% similarity]
drupal-configs/apache2/conf-available/serve-cgi-bin.conf [moved from drupal-configs/shopserver/apache2/conf-available/serve-cgi-bin.conf with 100% similarity]
drupal-configs/apache2/conf-enabled/charset.conf [moved from drupal-configs/shopserver/apache2/conf-enabled/charset.conf with 100% similarity]
drupal-configs/apache2/conf-enabled/drupal-fix-404s.conf [new file with mode: 0755]
drupal-configs/apache2/conf-enabled/localized-error-pages.conf [moved from drupal-configs/shopserver/apache2/conf-enabled/localized-error-pages.conf with 100% similarity]
drupal-configs/apache2/conf-enabled/other-vhosts-access-log.conf [moved from drupal-configs/shopserver/apache2/conf-enabled/other-vhosts-access-log.conf with 100% similarity]
drupal-configs/apache2/conf-enabled/php7.2-fpm.conf [new file with mode: 0644]
drupal-configs/apache2/conf-enabled/security.conf [moved from drupal-configs/shopserver/apache2/conf-enabled/security.conf with 98% similarity]
drupal-configs/apache2/conf-enabled/serve-cgi-bin.conf [moved from drupal-configs/shopserver/apache2/conf-enabled/serve-cgi-bin.conf with 100% similarity]
drupal-configs/apache2/conf-enabled/ssl.conf [new file with mode: 0644]
drupal-configs/apache2/envvars [moved from drupal-configs/shopserver/apache2/envvars with 96% similarity]
drupal-configs/apache2/magic [moved from drupal-configs/shopserver/apache2/magic with 100% similarity]
drupal-configs/apache2/mods-available/access_compat.load [moved from drupal-configs/shopserver/apache2/mods-available/access_compat.load with 100% similarity]
drupal-configs/apache2/mods-available/actions.conf [moved from drupal-configs/shopserver/apache2/mods-available/actions.conf with 100% similarity]
drupal-configs/apache2/mods-available/actions.load [moved from drupal-configs/shopserver/apache2/mods-available/actions.load with 100% similarity]
drupal-configs/apache2/mods-available/alias.conf [moved from drupal-configs/shopserver/apache2/mods-available/alias.conf with 100% similarity]
drupal-configs/apache2/mods-available/alias.load [moved from drupal-configs/shopserver/apache2/mods-available/alias.load with 100% similarity]
drupal-configs/apache2/mods-available/allowmethods.load [moved from drupal-configs/shopserver/apache2/mods-available/allowmethods.load with 100% similarity]
drupal-configs/apache2/mods-available/asis.load [moved from drupal-configs/shopserver/apache2/mods-available/asis.load with 100% similarity]
drupal-configs/apache2/mods-available/auth_basic.load [moved from drupal-configs/shopserver/apache2/mods-available/auth_basic.load with 100% similarity]
drupal-configs/apache2/mods-available/auth_digest.load [moved from drupal-configs/shopserver/apache2/mods-available/auth_digest.load with 100% similarity]
drupal-configs/apache2/mods-available/auth_form.load [moved from drupal-configs/shopserver/apache2/mods-available/auth_form.load with 100% similarity]
drupal-configs/apache2/mods-available/authn_anon.load [moved from drupal-configs/shopserver/apache2/mods-available/authn_anon.load with 100% similarity]
drupal-configs/apache2/mods-available/authn_core.load [moved from drupal-configs/shopserver/apache2/mods-available/authn_core.load with 100% similarity]
drupal-configs/apache2/mods-available/authn_dbd.load [moved from drupal-configs/shopserver/apache2/mods-available/authn_dbd.load with 100% similarity]
drupal-configs/apache2/mods-available/authn_dbm.load [moved from drupal-configs/shopserver/apache2/mods-available/authn_dbm.load with 100% similarity]
drupal-configs/apache2/mods-available/authn_file.load [moved from drupal-configs/shopserver/apache2/mods-available/authn_file.load with 100% similarity]
drupal-configs/apache2/mods-available/authn_socache.load [moved from drupal-configs/shopserver/apache2/mods-available/authn_socache.load with 100% similarity]
drupal-configs/apache2/mods-available/authnz_fcgi.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/authnz_ldap.load [moved from drupal-configs/shopserver/apache2/mods-available/authnz_ldap.load with 100% similarity]
drupal-configs/apache2/mods-available/authz_core.load [moved from drupal-configs/shopserver/apache2/mods-available/authz_core.load with 100% similarity]
drupal-configs/apache2/mods-available/authz_dbd.load [moved from drupal-configs/shopserver/apache2/mods-available/authz_dbd.load with 100% similarity]
drupal-configs/apache2/mods-available/authz_dbm.load [moved from drupal-configs/shopserver/apache2/mods-available/authz_dbm.load with 100% similarity]
drupal-configs/apache2/mods-available/authz_groupfile.load [moved from drupal-configs/shopserver/apache2/mods-available/authz_groupfile.load with 100% similarity]
drupal-configs/apache2/mods-available/authz_host.load [moved from drupal-configs/shopserver/apache2/mods-available/authz_host.load with 100% similarity]
drupal-configs/apache2/mods-available/authz_owner.load [moved from drupal-configs/shopserver/apache2/mods-available/authz_owner.load with 100% similarity]
drupal-configs/apache2/mods-available/authz_user.load [moved from drupal-configs/shopserver/apache2/mods-available/authz_user.load with 100% similarity]
drupal-configs/apache2/mods-available/autoindex.conf [moved from drupal-configs/shopserver/apache2/mods-available/autoindex.conf with 100% similarity]
drupal-configs/apache2/mods-available/autoindex.load [moved from drupal-configs/shopserver/apache2/mods-available/autoindex.load with 100% similarity]
drupal-configs/apache2/mods-available/buffer.load [moved from drupal-configs/shopserver/apache2/mods-available/buffer.load with 100% similarity]
drupal-configs/apache2/mods-available/cache.load [moved from drupal-configs/shopserver/apache2/mods-available/cache.load with 100% similarity]
drupal-configs/apache2/mods-available/cache_disk.conf [moved from drupal-configs/shopserver/apache2/mods-available/cache_disk.conf with 100% similarity]
drupal-configs/apache2/mods-available/cache_disk.load [moved from drupal-configs/shopserver/apache2/mods-available/cache_disk.load with 100% similarity]
drupal-configs/apache2/mods-available/cache_socache.load [moved from drupal-configs/shopserver/apache2/mods-available/cache_socache.load with 100% similarity]
drupal-configs/apache2/mods-available/cern_meta.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/cgi.load [moved from drupal-configs/shopserver/apache2/mods-available/cgi.load with 100% similarity]
drupal-configs/apache2/mods-available/cgid.conf [moved from drupal-configs/shopserver/apache2/mods-available/cgid.conf with 100% similarity]
drupal-configs/apache2/mods-available/cgid.load [moved from drupal-configs/shopserver/apache2/mods-available/cgid.load with 100% similarity]
drupal-configs/apache2/mods-available/charset_lite.load [moved from drupal-configs/shopserver/apache2/mods-available/charset_lite.load with 100% similarity]
drupal-configs/apache2/mods-available/data.load [moved from drupal-configs/shopserver/apache2/mods-available/data.load with 100% similarity]
drupal-configs/apache2/mods-available/dav.load [moved from drupal-configs/shopserver/apache2/mods-available/dav.load with 100% similarity]
drupal-configs/apache2/mods-available/dav_fs.conf [moved from drupal-configs/shopserver/apache2/mods-available/dav_fs.conf with 100% similarity]
drupal-configs/apache2/mods-available/dav_fs.load [moved from drupal-configs/shopserver/apache2/mods-available/dav_fs.load with 100% similarity]
drupal-configs/apache2/mods-available/dav_lock.load [moved from drupal-configs/shopserver/apache2/mods-available/dav_lock.load with 100% similarity]
drupal-configs/apache2/mods-available/dbd.load [moved from drupal-configs/shopserver/apache2/mods-available/dbd.load with 100% similarity]
drupal-configs/apache2/mods-available/deflate.conf [moved from drupal-configs/shopserver/apache2/mods-available/deflate.conf with 52% similarity]
drupal-configs/apache2/mods-available/deflate.load [moved from drupal-configs/shopserver/apache2/mods-available/deflate.load with 100% similarity]
drupal-configs/apache2/mods-available/dialup.load [moved from drupal-configs/shopserver/apache2/mods-available/dialup.load with 100% similarity]
drupal-configs/apache2/mods-available/dir.conf [moved from drupal-configs/shopserver/apache2/mods-available/dir.conf with 100% similarity]
drupal-configs/apache2/mods-available/dir.load [moved from drupal-configs/shopserver/apache2/mods-available/dir.load with 100% similarity]
drupal-configs/apache2/mods-available/dump_io.load [moved from drupal-configs/shopserver/apache2/mods-available/dump_io.load with 100% similarity]
drupal-configs/apache2/mods-available/echo.load [moved from drupal-configs/shopserver/apache2/mods-available/echo.load with 100% similarity]
drupal-configs/apache2/mods-available/env.load [moved from drupal-configs/shopserver/apache2/mods-available/env.load with 100% similarity]
drupal-configs/apache2/mods-available/expires.load [moved from drupal-configs/shopserver/apache2/mods-available/expires.load with 100% similarity]
drupal-configs/apache2/mods-available/ext_filter.load [moved from drupal-configs/shopserver/apache2/mods-available/ext_filter.load with 100% similarity]
drupal-configs/apache2/mods-available/fcgid.conf [new file with mode: 0644]
drupal-configs/apache2/mods-available/fcgid.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/file_cache.load [moved from drupal-configs/shopserver/apache2/mods-available/file_cache.load with 100% similarity]
drupal-configs/apache2/mods-available/filter.load [moved from drupal-configs/shopserver/apache2/mods-available/filter.load with 100% similarity]
drupal-configs/apache2/mods-available/headers.load [moved from drupal-configs/shopserver/apache2/mods-available/headers.load with 100% similarity]
drupal-configs/apache2/mods-available/heartbeat.load [moved from drupal-configs/shopserver/apache2/mods-available/heartbeat.load with 100% similarity]
drupal-configs/apache2/mods-available/heartmonitor.load [moved from drupal-configs/shopserver/apache2/mods-available/heartmonitor.load with 100% similarity]
drupal-configs/apache2/mods-available/http2.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/ident.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/imagemap.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/include.load [moved from drupal-configs/shopserver/apache2/mods-available/include.load with 100% similarity]
drupal-configs/apache2/mods-available/info.conf [moved from drupal-configs/shopserver/apache2/mods-available/info.conf with 100% similarity]
drupal-configs/apache2/mods-available/info.load [moved from drupal-configs/shopserver/apache2/mods-available/info.load with 100% similarity]
drupal-configs/apache2/mods-available/lbmethod_bybusyness.load [moved from drupal-configs/shopserver/apache2/mods-available/lbmethod_bybusyness.load with 100% similarity]
drupal-configs/apache2/mods-available/lbmethod_byrequests.load [moved from drupal-configs/shopserver/apache2/mods-available/lbmethod_byrequests.load with 100% similarity]
drupal-configs/apache2/mods-available/lbmethod_bytraffic.load [moved from drupal-configs/shopserver/apache2/mods-available/lbmethod_bytraffic.load with 100% similarity]
drupal-configs/apache2/mods-available/lbmethod_heartbeat.load [moved from drupal-configs/shopserver/apache2/mods-available/lbmethod_heartbeat.load with 100% similarity]
drupal-configs/apache2/mods-available/ldap.conf [moved from drupal-configs/shopserver/apache2/mods-available/ldap.conf with 100% similarity]
drupal-configs/apache2/mods-available/ldap.load [moved from drupal-configs/shopserver/apache2/mods-available/ldap.load with 100% similarity]
drupal-configs/apache2/mods-available/log_debug.load [moved from drupal-configs/shopserver/apache2/mods-available/log_debug.load with 100% similarity]
drupal-configs/apache2/mods-available/log_forensic.load [moved from drupal-configs/shopserver/apache2/mods-available/log_forensic.load with 100% similarity]
drupal-configs/apache2/mods-available/lua.load [moved from drupal-configs/shopserver/apache2/mods-available/lua.load with 100% similarity]
drupal-configs/apache2/mods-available/macro.load [moved from drupal-configs/shopserver/apache2/mods-available/macro.load with 100% similarity]
drupal-configs/apache2/mods-available/mime.conf [moved from drupal-configs/shopserver/apache2/mods-available/mime.conf with 99% similarity]
drupal-configs/apache2/mods-available/mime.load [moved from drupal-configs/shopserver/apache2/mods-available/mime.load with 100% similarity]
drupal-configs/apache2/mods-available/mime_magic.conf [moved from drupal-configs/shopserver/apache2/mods-available/mime_magic.conf with 100% similarity]
drupal-configs/apache2/mods-available/mime_magic.load [moved from drupal-configs/shopserver/apache2/mods-available/mime_magic.load with 100% similarity]
drupal-configs/apache2/mods-available/mpm_event.conf [moved from drupal-configs/shopserver/apache2/mods-available/mpm_event.conf with 100% similarity]
drupal-configs/apache2/mods-available/mpm_event.load [moved from drupal-configs/shopserver/apache2/mods-available/mpm_event.load with 100% similarity]
drupal-configs/apache2/mods-available/mpm_prefork.conf [new file with mode: 0644]
drupal-configs/apache2/mods-available/mpm_prefork.load [moved from drupal-configs/shopserver/apache2/mods-available/mpm_prefork.load with 100% similarity]
drupal-configs/apache2/mods-available/mpm_worker.conf [moved from drupal-configs/shopserver/apache2/mods-available/mpm_worker.conf with 100% similarity]
drupal-configs/apache2/mods-available/mpm_worker.load [moved from drupal-configs/shopserver/apache2/mods-available/mpm_worker.load with 100% similarity]
drupal-configs/apache2/mods-available/negotiation.conf [moved from drupal-configs/shopserver/apache2/mods-available/negotiation.conf with 100% similarity]
drupal-configs/apache2/mods-available/negotiation.load [moved from drupal-configs/shopserver/apache2/mods-available/negotiation.load with 100% similarity]
drupal-configs/apache2/mods-available/php7.2.conf [moved from drupal-configs/shopserver/apache2/mods-available/php5.conf with 82% similarity]
drupal-configs/apache2/mods-available/php7.2.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/proxy.conf [moved from drupal-configs/shopserver/apache2/mods-available/proxy.conf with 100% similarity]
drupal-configs/apache2/mods-available/proxy.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_ajp.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_ajp.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_balancer.conf [moved from drupal-configs/shopserver/apache2/mods-available/proxy_balancer.conf with 100% similarity]
drupal-configs/apache2/mods-available/proxy_balancer.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_balancer.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_connect.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_connect.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_express.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_express.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_fcgi.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_fcgi.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_fdpass.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_fdpass.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_ftp.conf [moved from drupal-configs/shopserver/apache2/mods-available/proxy_ftp.conf with 100% similarity]
drupal-configs/apache2/mods-available/proxy_ftp.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_ftp.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_hcheck.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/proxy_html.conf [new file with mode: 0644]
drupal-configs/apache2/mods-available/proxy_html.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_html.load with 74% similarity]
drupal-configs/apache2/mods-available/proxy_http.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_http.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_http2.load [new file with mode: 0644]
drupal-configs/apache2/mods-available/proxy_scgi.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_scgi.load with 100% similarity]
drupal-configs/apache2/mods-available/proxy_wstunnel.load [moved from drupal-configs/shopserver/apache2/mods-available/proxy_wstunnel.load with 100% similarity]
drupal-configs/apache2/mods-available/ratelimit.load [moved from drupal-configs/shopserver/apache2/mods-available/ratelimit.load with 100% similarity]
drupal-configs/apache2/mods-available/reflector.load [moved from drupal-configs/shopserver/apache2/mods-available/reflector.load with 100% similarity]
drupal-configs/apache2/mods-available/remoteip.load [moved from drupal-configs/shopserver/apache2/mods-available/remoteip.load with 100% similarity]
drupal-configs/apache2/mods-available/reqtimeout.conf [moved from drupal-configs/shopserver/apache2/mods-available/reqtimeout.conf with 100% similarity]
drupal-configs/apache2/mods-available/reqtimeout.load [moved from drupal-configs/shopserver/apache2/mods-available/reqtimeout.load with 100% similarity]
drupal-configs/apache2/mods-available/request.load [moved from drupal-configs/shopserver/apache2/mods-available/request.load with 100% similarity]
drupal-configs/apache2/mods-available/rewrite.load [moved from drupal-configs/shopserver/apache2/mods-available/rewrite.load with 100% similarity]
drupal-configs/apache2/mods-available/sed.load [moved from drupal-configs/shopserver/apache2/mods-available/sed.load with 100% similarity]
drupal-configs/apache2/mods-available/session.load [moved from drupal-configs/shopserver/apache2/mods-available/session.load with 100% similarity]
drupal-configs/apache2/mods-available/session_cookie.load [moved from drupal-configs/shopserver/apache2/mods-available/session_cookie.load with 100% similarity]
drupal-configs/apache2/mods-available/session_crypto.load [moved from drupal-configs/shopserver/apache2/mods-available/session_crypto.load with 100% similarity]
drupal-configs/apache2/mods-available/session_dbd.load [moved from drupal-configs/shopserver/apache2/mods-available/session_dbd.load with 100% similarity]
drupal-configs/apache2/mods-available/setenvif.conf [moved from drupal-configs/shopserver/apache2/mods-available/setenvif.conf with 100% similarity]
drupal-configs/apache2/mods-available/setenvif.load [moved from drupal-configs/shopserver/apache2/mods-available/setenvif.load with 100% similarity]
drupal-configs/apache2/mods-available/slotmem_plain.load [moved from drupal-configs/shopserver/apache2/mods-available/slotmem_plain.load with 100% similarity]
drupal-configs/apache2/mods-available/slotmem_shm.load [moved from drupal-configs/shopserver/apache2/mods-available/slotmem_shm.load with 100% similarity]
drupal-configs/apache2/mods-available/socache_dbm.load [moved from drupal-configs/shopserver/apache2/mods-available/socache_dbm.load with 100% similarity]
drupal-configs/apache2/mods-available/socache_memcache.load [moved from drupal-configs/shopserver/apache2/mods-available/socache_memcache.load with 100% similarity]
drupal-configs/apache2/mods-available/socache_shmcb.load [moved from drupal-configs/shopserver/apache2/mods-available/socache_shmcb.load with 100% similarity]
drupal-configs/apache2/mods-available/speling.load [moved from drupal-configs/shopserver/apache2/mods-available/speling.load with 100% similarity]
drupal-configs/apache2/mods-available/ssl.conf [moved from drupal-configs/shopserver/apache2/mods-available/ssl.conf_1467135174_Tue_Jun_28_13_32_54_2016_.cfsaved with 77% similarity]
drupal-configs/apache2/mods-available/ssl.load [moved from drupal-configs/shopserver/apache2/mods-available/ssl.load with 100% similarity]
drupal-configs/apache2/mods-available/status.conf [moved from drupal-configs/shopserver/apache2/mods-available/status.conf with 100% similarity]
drupal-configs/apache2/mods-available/status.load [moved from drupal-configs/shopserver/apache2/mods-available/status.load with 100% similarity]
drupal-configs/apache2/mods-available/substitute.load [moved from drupal-configs/shopserver/apache2/mods-available/substitute.load with 100% similarity]
drupal-configs/apache2/mods-available/suexec.load [moved from drupal-configs/shopserver/apache2/mods-available/suexec.load with 100% similarity]
drupal-configs/apache2/mods-available/unique_id.load [moved from drupal-configs/shopserver/apache2/mods-available/unique_id.load with 100% similarity]
drupal-configs/apache2/mods-available/userdir.conf [moved from drupal-configs/shopserver/apache2/mods-available/userdir.conf with 68% similarity]
drupal-configs/apache2/mods-available/userdir.load [moved from drupal-configs/shopserver/apache2/mods-available/userdir.load with 100% similarity]
drupal-configs/apache2/mods-available/usertrack.load [moved from drupal-configs/shopserver/apache2/mods-available/usertrack.load with 100% similarity]
drupal-configs/apache2/mods-available/vhost_alias.load [moved from drupal-configs/shopserver/apache2/mods-available/vhost_alias.load with 100% similarity]
drupal-configs/apache2/mods-available/xml2enc.load [moved from drupal-configs/shopserver/apache2/mods-available/xml2enc.load with 100% similarity]
drupal-configs/apache2/mods-enabled/access_compat.load [moved from drupal-configs/shopserver/apache2/mods-enabled/access_compat.load with 100% similarity]
drupal-configs/apache2/mods-enabled/alias.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/alias.conf with 100% similarity]
drupal-configs/apache2/mods-enabled/alias.load [moved from drupal-configs/shopserver/apache2/mods-enabled/alias.load with 100% similarity]
drupal-configs/apache2/mods-enabled/auth_basic.load [moved from drupal-configs/shopserver/apache2/mods-enabled/auth_basic.load with 100% similarity]
drupal-configs/apache2/mods-enabled/authn_core.load [moved from drupal-configs/shopserver/apache2/mods-enabled/authn_core.load with 100% similarity]
drupal-configs/apache2/mods-enabled/authn_file.load [moved from drupal-configs/shopserver/apache2/mods-enabled/authn_file.load with 100% similarity]
drupal-configs/apache2/mods-enabled/authz_core.load [moved from drupal-configs/shopserver/apache2/mods-enabled/authz_core.load with 100% similarity]
drupal-configs/apache2/mods-enabled/authz_host.load [moved from drupal-configs/shopserver/apache2/mods-enabled/authz_host.load with 100% similarity]
drupal-configs/apache2/mods-enabled/authz_user.load [moved from drupal-configs/shopserver/apache2/mods-enabled/authz_user.load with 100% similarity]
drupal-configs/apache2/mods-enabled/autoindex.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/autoindex.conf with 100% similarity]
drupal-configs/apache2/mods-enabled/autoindex.load [moved from drupal-configs/shopserver/apache2/mods-enabled/autoindex.load with 100% similarity]
drupal-configs/apache2/mods-enabled/deflate.conf [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/deflate.load [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/dir.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/dir.conf with 100% similarity]
drupal-configs/apache2/mods-enabled/dir.load [moved from drupal-configs/shopserver/apache2/mods-enabled/dir.load with 100% similarity]
drupal-configs/apache2/mods-enabled/env.load [moved from drupal-configs/shopserver/apache2/mods-enabled/env.load with 100% similarity]
drupal-configs/apache2/mods-enabled/expires.load [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/fcgid.conf [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/fcgid.load [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/filter.load [moved from drupal-configs/shopserver/apache2/mods-enabled/filter.load with 100% similarity]
drupal-configs/apache2/mods-enabled/headers.load [moved from drupal-configs/shopserver/apache2/mods-enabled/headers.load with 100% similarity]
drupal-configs/apache2/mods-enabled/mime.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/mime.conf with 99% similarity]
drupal-configs/apache2/mods-enabled/mime.load [moved from drupal-configs/shopserver/apache2/mods-enabled/mime.load with 100% similarity]
drupal-configs/apache2/mods-enabled/mpm_prefork.conf [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/mpm_prefork.load [moved from drupal-configs/shopserver/apache2/mods-enabled/mpm_prefork.load with 100% similarity]
drupal-configs/apache2/mods-enabled/negotiation.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/negotiation.conf with 100% similarity]
drupal-configs/apache2/mods-enabled/negotiation.load [moved from drupal-configs/shopserver/apache2/mods-enabled/negotiation.load with 100% similarity]
drupal-configs/apache2/mods-enabled/php7.2.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/php5.conf with 82% similarity]
drupal-configs/apache2/mods-enabled/php7.2.load [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/proxy.conf [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/proxy.load [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/proxy_fcgi.load [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/reqtimeout.conf [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/reqtimeout.load [new file with mode: 0644]
drupal-configs/apache2/mods-enabled/rewrite.load [moved from drupal-configs/shopserver/apache2/mods-enabled/rewrite.load with 100% similarity]
drupal-configs/apache2/mods-enabled/setenvif.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/setenvif.conf with 100% similarity]
drupal-configs/apache2/mods-enabled/setenvif.load [moved from drupal-configs/shopserver/apache2/mods-enabled/setenvif.load with 100% similarity]
drupal-configs/apache2/mods-enabled/socache_shmcb.load [moved from drupal-configs/shopserver/apache2/mods-enabled/socache_shmcb.load with 100% similarity]
drupal-configs/apache2/mods-enabled/ssl.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/ssl.conf with 76% similarity]
drupal-configs/apache2/mods-enabled/ssl.load [moved from drupal-configs/shopserver/apache2/mods-enabled/ssl.load with 100% similarity]
drupal-configs/apache2/mods-enabled/status.conf [moved from drupal-configs/shopserver/apache2/mods-enabled/status.conf with 100% similarity]
drupal-configs/apache2/mods-enabled/status.load [moved from drupal-configs/shopserver/apache2/mods-enabled/status.load with 100% similarity]
drupal-configs/apache2/ports.conf [moved from drupal-configs/shopserver/apache2/ports.conf with 100% similarity]
drupal-configs/apache2/sites-available/000-default.conf [moved from drupal-configs/shopserver/apache2/sites-available/000-default.conf with 87% similarity]
drupal-configs/apache2/sites-available/default-ssl.conf [moved from drupal-configs/shopserver/apache2/sites-available/default-ssl.conf with 96% similarity]
drupal-configs/apache2/sites-available/shopserver1p.fsf.org-ssl.conf [new file with mode: 0644]
drupal-configs/apache2/sites-available/shopserver1p.fsf.org.conf [new file with mode: 0644]
drupal-configs/apache2/sites-enabled/000-default.conf [moved from drupal-configs/shopserver/apache2/sites-available/000-default-le-ssl.conf with 76% similarity]
drupal-configs/apache2/sites-enabled/shopserver1p.fsf.org-ssl.conf [new file with mode: 0644]
drupal-configs/shopserver/apache2/conf-enabled/ssl.conf [deleted file]
drupal-configs/shopserver/apache2/mods-available/mpm_prefork.conf [deleted file]
drupal-configs/shopserver/apache2/mods-available/php5.load [deleted file]
drupal-configs/shopserver/apache2/mods-available/ssl.conf [deleted file]
drupal-configs/shopserver/apache2/mods-enabled/mpm_prefork.conf [deleted file]
drupal-configs/shopserver/apache2/mods-enabled/php5.load [deleted file]
drupal-configs/shopserver/apache2/sites-available/gnupress.org-common [deleted file]
drupal-configs/shopserver/apache2/sites-available/gnupress.org.conf [deleted file]
drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common [deleted file]
drupal-configs/shopserver/apache2/sites-available/shop.fsf.org-common~ [deleted file]
drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf [deleted file]
drupal-configs/shopserver/apache2/sites-available/shopserver0p.fsf.org.conf~ [deleted file]
drupal-configs/shopserver/apache2/sites-available/ssl-common.conf [deleted file]
drupal-configs/shopserver/apache2/sites-available/ssl-common.conf.cfsaved [deleted file]
drupal-configs/shopserver/apache2/sites-enabled/01-shopserver0p.fsf.org.conf [deleted file]
drupal-configs/shopserver/apache2/sites-enabled/02-gnupress.org.conf [deleted file]
drupal-configs/shopserver/conf [deleted file]
drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf [deleted file]
drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf [deleted file]

similarity index 97%
rename from drupal-configs/shopserver/apache2/apache2.conf
rename to drupal-configs/apache2/apache2.conf
index baf6d8a..ae4b2c3 100644 (file)
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
 #
 # 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
 
 #
 # PidFile: The file in which the server should record its process
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 (executable)
index 0000000..a17eb05
--- /dev/null
@@ -0,0 +1,4 @@
+# do this so that .htaccess can cause things to not 404
+<Directory /var/www/html>
+       AllowOverride All
+</Directory>
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 (file)
index 0000000..d15343f
--- /dev/null
@@ -0,0 +1,23 @@
+# Redirect to local php-fpm if mod_php is not available
+<IfModule !mod_php7.c>
+<IfModule proxy_fcgi_module>
+    # Enable http authorization headers
+    <IfModule setenvif_module>
+    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+    </IfModule>
+
+    <FilesMatch ".+\.ph(ar|p|tml)$">
+        SetHandler "proxy:unix:/run/php/php7.2-fpm.sock|fcgi://localhost"
+    </FilesMatch>
+    <FilesMatch ".+\.phps$">
+        # 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
+    </FilesMatch>
+    # Deny access to files without filename (e.g. '.php')
+    <FilesMatch "^\.ph(ar|p|ps|tml)$">
+        Require all denied
+    </FilesMatch>
+</IfModule>
+</IfModule>
@@ -7,8 +7,7 @@
 #
 #<Directory />
 #   AllowOverride None
 #
 #<Directory />
 #   AllowOverride None
-#   Order Deny,Allow
-#   Deny from all
+#   Require all denied
 #</Directory>
 
 
 #</Directory>
 
 
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 (executable)
index 0000000..a17eb05
--- /dev/null
@@ -0,0 +1,4 @@
+# do this so that .htaccess can cause things to not 404
+<Directory /var/www/html>
+       AllowOverride All
+</Directory>
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 (file)
index 0000000..d15343f
--- /dev/null
@@ -0,0 +1,23 @@
+# Redirect to local php-fpm if mod_php is not available
+<IfModule !mod_php7.c>
+<IfModule proxy_fcgi_module>
+    # Enable http authorization headers
+    <IfModule setenvif_module>
+    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+    </IfModule>
+
+    <FilesMatch ".+\.ph(ar|p|tml)$">
+        SetHandler "proxy:unix:/run/php/php7.2-fpm.sock|fcgi://localhost"
+    </FilesMatch>
+    <FilesMatch ".+\.phps$">
+        # 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
+    </FilesMatch>
+    # Deny access to files without filename (e.g. '.php')
+    <FilesMatch "^\.ph(ar|p|ps|tml)$">
+        Require all denied
+    </FilesMatch>
+</IfModule>
+</IfModule>
@@ -7,8 +7,7 @@
 #
 #<Directory />
 #   AllowOverride None
 #
 #<Directory />
 #   AllowOverride None
-#   Order Deny,Allow
-#   Deny from all
+#   Require all denied
 #</Directory>
 
 
 #</Directory>
 
 
diff --git a/drupal-configs/apache2/conf-enabled/ssl.conf b/drupal-configs/apache2/conf-enabled/ssl.conf
new file mode 100644 (file)
index 0000000..89583b9
--- /dev/null
@@ -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"
similarity index 96%
rename from drupal-configs/shopserver/apache2/envvars
rename to drupal-configs/apache2/envvars
index 91328ac..708d170 100644 (file)
@@ -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_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.
 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/apache2/mods-available/authnz_fcgi.load b/drupal-configs/apache2/mods-available/authnz_fcgi.load
new file mode 100644 (file)
index 0000000..69d757c
--- /dev/null
@@ -0,0 +1 @@
+LoadModule authnz_fcgi_module /usr/lib/apache2/modules/mod_authnz_fcgi.so
diff --git a/drupal-configs/apache2/mods-available/cern_meta.load b/drupal-configs/apache2/mods-available/cern_meta.load
new file mode 100644 (file)
index 0000000..bcc7546
--- /dev/null
@@ -0,0 +1 @@
+LoadModule cern_meta_module /usr/lib/apache2/modules/mod_cern_meta.so
@@ -1,14 +1,9 @@
 <IfModule mod_deflate.c>
        <IfModule mod_filter.c>
 <IfModule mod_deflate.c>
        <IfModule mod_filter.c>
-               # 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/x-javascript application/javascript application/ecmascript
                AddOutputFilterByType DEFLATE application/rss+xml
-               #AddOutputFilterByType DEFLATE application/xml
+               AddOutputFilterByType DEFLATE application/xml
        </IfModule>
 </IfModule>
 
        </IfModule>
 </IfModule>
 
diff --git a/drupal-configs/apache2/mods-available/fcgid.conf b/drupal-configs/apache2/mods-available/fcgid.conf
new file mode 100644 (file)
index 0000000..ace956d
--- /dev/null
@@ -0,0 +1,7 @@
+<IfModule mod_fcgid.c>
+  FcgidConnectTimeout 20
+
+  <IfModule mod_mime.c>
+    AddHandler fcgid-script .fcgi
+  </IfModule>
+</IfModule>
diff --git a/drupal-configs/apache2/mods-available/fcgid.load b/drupal-configs/apache2/mods-available/fcgid.load
new file mode 100644 (file)
index 0000000..3c15f74
--- /dev/null
@@ -0,0 +1 @@
+LoadModule fcgid_module /usr/lib/apache2/modules/mod_fcgid.so
diff --git a/drupal-configs/apache2/mods-available/http2.load b/drupal-configs/apache2/mods-available/http2.load
new file mode 100644 (file)
index 0000000..e5c769f
--- /dev/null
@@ -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 (file)
index 0000000..f7c4c3c
--- /dev/null
@@ -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 (file)
index 0000000..0fd55f8
--- /dev/null
@@ -0,0 +1 @@
+LoadModule imagemap_module /usr/lib/apache2/modules/mod_imagemap.so
        # (You will also need to add "Includes" to the "Options" directive.)
        #
        AddType text/html .shtml
        # (You will also need to add "Includes" to the "Options" directive.)
        #
        AddType text/html .shtml
+<IfModule mod_include.c>
        AddOutputFilter INCLUDES .shtml
        AddOutputFilter INCLUDES .shtml
+</IfModule>
 
 </IfModule>
 
 
 </IfModule>
 
diff --git a/drupal-configs/apache2/mods-available/mpm_prefork.conf b/drupal-configs/apache2/mods-available/mpm_prefork.conf
new file mode 100644 (file)
index 0000000..2642e3b
--- /dev/null
@@ -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
+
+<IfModule mpm_prefork_module>
+       StartServers                     5
+       MinSpareServers           5
+       MaxSpareServers          10
+       MaxRequestWorkers         150
+       MaxConnectionsPerChild   0
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
@@ -1,4 +1,4 @@
-<FilesMatch ".+\.ph(p[345]?|t|tml)$">
+<FilesMatch ".+\.ph(ar|p|tml)$">
     SetHandler application/x-httpd-php
 </FilesMatch>
 <FilesMatch ".+\.phps$">
     SetHandler application/x-httpd-php
 </FilesMatch>
 <FilesMatch ".+\.phps$">
@@ -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
     # 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
 </FilesMatch>
 # Deny access to files without filename (e.g. '.php')
 </FilesMatch>
 # Deny access to files without filename (e.g. '.php')
-<FilesMatch "^\.ph(p[345]?|t|tml|ps)$">
-    Order Deny,Allow
-    Deny from all
+<FilesMatch "^\.ph(ar|p|ps|tml)$">
+    Require all denied
 </FilesMatch>
 
 # Running PHP scripts in user directories is disabled by default
 </FilesMatch>
 
 # 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 (file)
index 0000000..0ff366e
--- /dev/null
@@ -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-available/proxy_hcheck.load b/drupal-configs/apache2/mods-available/proxy_hcheck.load
new file mode 100644 (file)
index 0000000..b70f421
--- /dev/null
@@ -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 (file)
index 0000000..14692ad
--- /dev/null
@@ -0,0 +1,75 @@
+# Configuration example.
+#
+# For detailed information about these directives see
+# <URL:http://httpd.apache.org/docs/2.4/mod/mod_proxy_html.html>
+# and for mod_xml2enc see
+# <URL:http://httpd.apache.org/docs/2.4/mod/mod_xml2enc.html>
+#
+
+# 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 <Location>.
+#
+# 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/
+# <Location /my-gateway/>
+#      ProxyPassReverse /
+#      ProxyHTMLEnable On
+#      ProxyHTMLURLMap http://some.app.intranet/ /my-gateway/
+#      ProxyHTMLURLMap / /my-gateway/
+# </Location>
+#
+# 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
@@ -1,2 +1,2 @@
-# Depends: proxy
+# Depends: proxy xml2enc
 LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so
 LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so
diff --git a/drupal-configs/apache2/mods-available/proxy_http2.load b/drupal-configs/apache2/mods-available/proxy_http2.load
new file mode 100644 (file)
index 0000000..b251d0c
--- /dev/null
@@ -0,0 +1,2 @@
+# Depends: proxy http2
+LoadModule proxy_http2_module /usr/lib/apache2/modules/mod_proxy_http2.so
@@ -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.
        #   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 
 
        #   Inter-Process Session Cache:
        #   Configure the SSL Session Cache: First the mechanism 
        #   ciphers(1) man page from the openssl package for list of all available
        #   options.
        #   Enable only secure ciphers:
        #   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
        #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
 
        #   Allow insecure renegotiation with clients which do not yet support the
        #   secure renegotiation protocol. Default: Off
@@ -5,12 +5,7 @@
        <Directory /home/*/public_html>
                AllowOverride FileInfo AuthConfig Limit Indexes
                Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
        <Directory /home/*/public_html>
                AllowOverride FileInfo AuthConfig Limit Indexes
                Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-               <Limit GET POST OPTIONS>
-                       Require all granted
-               </Limit>
-               <LimitExcept GET POST OPTIONS>
-                       Require all denied
-               </LimitExcept>
+               Require method GET POST OPTIONS
        </Directory>
 </IfModule>
 
        </Directory>
 </IfModule>
 
diff --git a/drupal-configs/apache2/mods-enabled/deflate.conf b/drupal-configs/apache2/mods-enabled/deflate.conf
new file mode 100644 (file)
index 0000000..db48f92
--- /dev/null
@@ -0,0 +1,10 @@
+<IfModule mod_deflate.c>
+       <IfModule mod_filter.c>
+               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
+       </IfModule>
+</IfModule>
+
+# 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 (file)
index 0000000..3873ffc
--- /dev/null
@@ -0,0 +1,2 @@
+# Depends: filter
+LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so
diff --git a/drupal-configs/apache2/mods-enabled/expires.load b/drupal-configs/apache2/mods-enabled/expires.load
new file mode 100644 (file)
index 0000000..092acab
--- /dev/null
@@ -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 (file)
index 0000000..ace956d
--- /dev/null
@@ -0,0 +1,7 @@
+<IfModule mod_fcgid.c>
+  FcgidConnectTimeout 20
+
+  <IfModule mod_mime.c>
+    AddHandler fcgid-script .fcgi
+  </IfModule>
+</IfModule>
diff --git a/drupal-configs/apache2/mods-enabled/fcgid.load b/drupal-configs/apache2/mods-enabled/fcgid.load
new file mode 100644 (file)
index 0000000..3c15f74
--- /dev/null
@@ -0,0 +1 @@
+LoadModule fcgid_module /usr/lib/apache2/modules/mod_fcgid.so
        # (You will also need to add "Includes" to the "Options" directive.)
        #
        AddType text/html .shtml
        # (You will also need to add "Includes" to the "Options" directive.)
        #
        AddType text/html .shtml
+<IfModule mod_include.c>
        AddOutputFilter INCLUDES .shtml
        AddOutputFilter INCLUDES .shtml
+</IfModule>
 
 </IfModule>
 
 
 </IfModule>
 
diff --git a/drupal-configs/apache2/mods-enabled/mpm_prefork.conf b/drupal-configs/apache2/mods-enabled/mpm_prefork.conf
new file mode 100644 (file)
index 0000000..2642e3b
--- /dev/null
@@ -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
+
+<IfModule mpm_prefork_module>
+       StartServers                     5
+       MinSpareServers           5
+       MaxSpareServers          10
+       MaxRequestWorkers         150
+       MaxConnectionsPerChild   0
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
@@ -1,4 +1,4 @@
-<FilesMatch ".+\.ph(p[345]?|t|tml)$">
+<FilesMatch ".+\.ph(ar|p|tml)$">
     SetHandler application/x-httpd-php
 </FilesMatch>
 <FilesMatch ".+\.phps$">
     SetHandler application/x-httpd-php
 </FilesMatch>
 <FilesMatch ".+\.phps$">
@@ -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
     # 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
 </FilesMatch>
 # Deny access to files without filename (e.g. '.php')
 </FilesMatch>
 # Deny access to files without filename (e.g. '.php')
-<FilesMatch "^\.ph(p[345]?|t|tml|ps)$">
-    Order Deny,Allow
-    Deny from all
+<FilesMatch "^\.ph(ar|p|ps|tml)$">
+    Require all denied
 </FilesMatch>
 
 # Running PHP scripts in user directories is disabled by default
 </FilesMatch>
 
 # 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 (file)
index 0000000..0ff366e
--- /dev/null
@@ -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 (file)
index 0000000..cf4a9fb
--- /dev/null
@@ -0,0 +1,27 @@
+<IfModule mod_proxy.c>
+
+       # If you want to use apache2 as a forward proxy, uncomment the
+       # 'ProxyRequests On' line and the <Proxy *> block below.
+       # WARNING: Be careful to restrict access inside the <Proxy *> 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
+       #<Proxy *>
+       #   AddDefaultCharset off
+       #   Require all denied
+       #   #Require local
+       #</Proxy>
+
+       # 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
+
+</IfModule>
+
+# 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 (file)
index 0000000..8828205
--- /dev/null
@@ -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 (file)
index 0000000..067c87e
--- /dev/null
@@ -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 (file)
index 0000000..534cd88
--- /dev/null
@@ -0,0 +1,27 @@
+<IfModule reqtimeout_module>
+
+       # 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
+
+</IfModule>
+
+# 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 (file)
index 0000000..8b2c5e6
--- /dev/null
@@ -0,0 +1 @@
+LoadModule reqtimeout_module /usr/lib/apache2/modules/mod_reqtimeout.so
@@ -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.
        #   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 
 
        #   Inter-Process Session Cache:
        #   Configure the SSL Session Cache: First the mechanism 
        #   ciphers(1) man page from the openssl package for list of all available
        #   options.
        #   Enable only secure ciphers:
        #   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
        #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
 
        #   Allow insecure renegotiation with clients which do not yet support the
        #   secure renegotiation protocol. Default: Off
@@ -87,4 +83,3 @@
 </IfModule>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
 </IfModule>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-SSLStaplingCache "shmcb:logs/stapling-cache(150000)"
        # 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
        # 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
+       <IfModule mod_rewrite.c>
+               RewriteEngine On
+               RewriteCond %{HTTPS} off
+               RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+       </IfModule>
 </VirtualHost>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
 </VirtualHost>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
                #   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.
                #   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
 
        </VirtualHost>
 </IfModule>
 
        </VirtualHost>
 </IfModule>
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 (file)
index 0000000..cf18082
--- /dev/null
@@ -0,0 +1,36 @@
+# File deployed by Ansible, changes will be PRESERVED
+
+<IfModule mod_ssl.c>
+       <VirtualHost _default_:443>
+               ServerName shopserver1p.fsf.org
+               ServerAdmin sysadmin@gnu.org
+
+               DocumentRoot /var/www/html
+
+               #<Directory /var/www>
+               #       Options -Indexes -FollowSymLinks
+               #       AllowOverride None
+               #</Directory>
+
+               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
+
+               <FilesMatch "\.(cgi|shtml|phtml|php)$">
+                               SSLOptions +StdEnvVars
+               </FilesMatch>
+               <Directory /usr/lib/cgi-bin>
+                               SSLOptions +StdEnvVars
+               </Directory>
+
+                # 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
+
+       </VirtualHost>
+</IfModule>
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 (file)
index 0000000..f5667ed
--- /dev/null
@@ -0,0 +1,16 @@
+# File deployed by Ansible, changes will be PRESERVED
+
+<VirtualHost *:80>
+        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
+
+</VirtualHost>
@@ -1,5 +1,4 @@
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
+<VirtualHost *:80>
        # 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
        # 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
        # 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
        # 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
+       <IfModule mod_rewrite.c>
+               RewriteEngine On
+               RewriteCond %{HTTPS} off
+               RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+       </IfModule>
 </VirtualHost>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
 </VirtualHost>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-</IfModule>
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 (file)
index 0000000..cf18082
--- /dev/null
@@ -0,0 +1,36 @@
+# File deployed by Ansible, changes will be PRESERVED
+
+<IfModule mod_ssl.c>
+       <VirtualHost _default_:443>
+               ServerName shopserver1p.fsf.org
+               ServerAdmin sysadmin@gnu.org
+
+               DocumentRoot /var/www/html
+
+               #<Directory /var/www>
+               #       Options -Indexes -FollowSymLinks
+               #       AllowOverride None
+               #</Directory>
+
+               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
+
+               <FilesMatch "\.(cgi|shtml|phtml|php)$">
+                               SSLOptions +StdEnvVars
+               </FilesMatch>
+               <Directory /usr/lib/cgi-bin>
+                               SSLOptions +StdEnvVars
+               </Directory>
+
+                # 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
+
+       </VirtualHost>
+</IfModule>
diff --git a/drupal-configs/shopserver/apache2/conf-enabled/ssl.conf b/drupal-configs/shopserver/apache2/conf-enabled/ssl.conf
deleted file mode 100644 (file)
index 62bef0f..0000000
+++ /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 (file)
index f4fee0e..0000000
+++ /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
-
-<IfModule mpm_prefork_module>
-       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
-</IfModule>
-
-# 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 (file)
index 653695f..0000000
+++ /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 (file)
index 1e6d994..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<IfModule mod_ssl.c>
-
-       # 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
-
-</IfModule>
-
-# 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 (file)
index f4fee0e..0000000
+++ /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
-
-<IfModule mpm_prefork_module>
-       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
-</IfModule>
-
-# 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 (file)
index 653695f..0000000
+++ /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 (file)
index 325d93d..0000000
+++ /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 (file)
index ee199c6..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-##################################################################
-<VirtualHost *:80>
-       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
-</VirtualHost>
-##################################################################
-
-##################################################################
-<VirtualHost *:443>
-       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
-</VirtualHost>
-##################################################################
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 (file)
index cef75e0..0000000
+++ /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 (file)
index d9157cf..0000000
+++ /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 (file)
index 6ce41b5..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-##################################################################
-<VirtualHost *:80>
-       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
-</VirtualHost>
-##################################################################
-
-##################################################################
-<VirtualHost *:443>
-       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
-
-        <Files stock-report.csv>
-        Order deny,allow
-        Deny from all
-        Allow from 74.94.156.210 74.94.156.211
-        </Files>
-
-
-        <Directory /var/www/shopserver0p.fsf.org>
-               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
-       </Directory>
-
-        Alias /shop-reports /srv/shop-reports
-        <Directory /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
-        </Directory>
-
-        <Files sales-reports.csv>
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193
-        </Files>
-       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
-
-</VirtualHost>
-##################################################################
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 (file)
index 3678d00..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-##################################################################
-<VirtualHost *:80>
-       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
-</VirtualHost>
-##################################################################
-
-##################################################################
-<VirtualHost *:443>
-       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
-
-
-        <Directory /var/www/shopserver0p.fsf.org>
-               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
-       </Directory>
-
-
-       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
-
-</VirtualHost>
-##################################################################
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 (file)
index 38af572..0000000
+++ /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 (file)
index 139d56b..0000000
+++ /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 (file)
index 42e0410..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-##################################################################
-<VirtualHost *:80>
-       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
-</VirtualHost>
-##################################################################
-
-##################################################################
-<VirtualHost *:443>
-       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
-
-
-        <Directory /var/www/shopserver0p.fsf.org>
-               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
-       </Directory>
-
-        Alias /shop-reports /srv/shop-reports
-        <Directory /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
-        </Directory>
-
-        <Files sales-reports.csv>
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193
-        </Files>
-
-        <Files stock-report.csv>
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1 74.94.156.210 74.94.156.211
-        </Files>
-
-       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
-
-</VirtualHost>
-##################################################################
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 (file)
index a002282..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-##################################################################
-<VirtualHost *:80>
-       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
-</VirtualHost>
-##################################################################
-
-##################################################################
-<VirtualHost *:443>
-       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
-</VirtualHost>
-##################################################################
diff --git a/drupal-configs/shopserver/conf b/drupal-configs/shopserver/conf
deleted file mode 100644 (file)
index 3b800fa..0000000
+++ /dev/null
@@ -1,308 +0,0 @@
-       <Files sales-reports.csv>
-               Order deny,allow
-               Deny from all
-               Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193
-       </Files>
-
-       <Files stock-report.csv>
-               Order deny,allow
-               Deny from all
-               Allow from 127.0.0.1 74.94.156.210 74.94.156.211
-        </Files>
-
-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 (file)
index 42e0410..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-##################################################################
-<VirtualHost *:80>
-       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
-</VirtualHost>
-##################################################################
-
-##################################################################
-<VirtualHost *:443>
-       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
-
-
-        <Directory /var/www/shopserver0p.fsf.org>
-               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
-       </Directory>
-
-        Alias /shop-reports /srv/shop-reports
-        <Directory /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
-        </Directory>
-
-        <Files sales-reports.csv>
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193
-        </Files>
-
-        <Files stock-report.csv>
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1 74.94.156.210 74.94.156.211
-        </Files>
-
-       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
-
-</VirtualHost>
-##################################################################
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 (file)
index a002282..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-##################################################################
-<VirtualHost *:80>
-       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
-</VirtualHost>
-##################################################################
-
-##################################################################
-<VirtualHost *:443>
-       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
-</VirtualHost>
-##################################################################