backing up shopserver1p apache config

[eostre.git] / drupal-configs / apache2 / sites-enabled / 000-default.conf

diff --git a/drupal-configs/shopserver/apache2/sites-available/000-default-le-ssl.conf b/drupal-configs/apache2/sites-enabled/000-default.conf
similarity index 76%
rename from drupal-configs/shopserver/apache2/sites-available/000-default-le-ssl.conf
rename to drupal-configs/apache2/sites-enabled/000-default.conf
index 22c2b292b855c82ba4041f785160d6c43ec88641..f9ee84bb60908d1ac28b9cd7f7defd8b213a10e7 100644 (file)
--- a/drupal-configs/shopserver/apache2/sites-available/000-default-le-ssl.conf
+++ b/drupal-configs/apache2/sites-enabled/000-default.conf
@@ -1,5 +1,4 @@
-<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
@@ -27,14 +26,12 @@
        # following line enables the CGI configuration for this host only
        # after it has been globally disabled with "a2disconf".
        #Include conf-available/serve-cgi-bin.conf
-SSLCertificateFile /etc/letsencrypt/live/shopserver0p.fsf.org/cert.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/shopserver0p.fsf.org/privkey.pem
-Include /etc/letsencrypt/options-ssl-apache.conf
-ServerName shop.fsf.org
-ServerAlias store.fsf.org
-ServerAlias shopserver0p.fsf.org
-SSLCertificateChainFile /etc/letsencrypt/live/shopserver0p.fsf.org/chain.pem
+           # Redirect HTTP connections to HTTPS
+       <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
-</IfModule>