From b6674c02a2ffcb302eefa24d9a2a21f8867146be Mon Sep 17 00:00:00 2001 From: eostre Date: Wed, 16 Sep 2020 16:19:16 -0400 Subject: [PATCH] move server-specific configuration into a directory --- .../dbd-autobuild}/Makefile | 0 .../dbd-autobuild}/bm.sh | 0 .../dbd-autobuild}/bootstrap.sh | 0 .../dbd-autobuild}/conf/dbd.conf | 0 .../dbd-autobuild}/conf/drupal-fix-404s.conf | 0 .../dbd-autobuild}/conf/redirect-domains.conf | 0 .../dbd-autobuild}/files/RELEASE | 0 .../dbd-autobuild}/files/do-mysql.sh | 0 .../files/install-drupal-toolchain.sh | 0 .../dbd-autobuild}/files/install-packages.sh | 0 .../dbd-autobuild}/files/pkgs | 0 .../dbd-autobuild}/files/sqldefaults | 0 .../01-shopserver0p.fsf.org.conf | 76 +++++++++++++++++++ .../sites-enabled/02-gnupress.org.conf | 39 ++++++++++ 14 files changed, 115 insertions(+) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/Makefile (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/bm.sh (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/bootstrap.sh (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/conf/dbd.conf (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/conf/drupal-fix-404s.conf (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/conf/redirect-domains.conf (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/files/RELEASE (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/files/do-mysql.sh (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/files/install-drupal-toolchain.sh (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/files/install-packages.sh (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/files/pkgs (100%) rename {dbd-autobuild => drupal-configs/dbd-autobuild}/files/sqldefaults (100%) create mode 100644 drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf create mode 100644 drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf diff --git a/dbd-autobuild/Makefile b/drupal-configs/dbd-autobuild/Makefile similarity index 100% rename from dbd-autobuild/Makefile rename to drupal-configs/dbd-autobuild/Makefile diff --git a/dbd-autobuild/bm.sh b/drupal-configs/dbd-autobuild/bm.sh similarity index 100% rename from dbd-autobuild/bm.sh rename to drupal-configs/dbd-autobuild/bm.sh diff --git a/dbd-autobuild/bootstrap.sh b/drupal-configs/dbd-autobuild/bootstrap.sh similarity index 100% rename from dbd-autobuild/bootstrap.sh rename to drupal-configs/dbd-autobuild/bootstrap.sh diff --git a/dbd-autobuild/conf/dbd.conf b/drupal-configs/dbd-autobuild/conf/dbd.conf similarity index 100% rename from dbd-autobuild/conf/dbd.conf rename to drupal-configs/dbd-autobuild/conf/dbd.conf diff --git a/dbd-autobuild/conf/drupal-fix-404s.conf b/drupal-configs/dbd-autobuild/conf/drupal-fix-404s.conf similarity index 100% rename from dbd-autobuild/conf/drupal-fix-404s.conf rename to drupal-configs/dbd-autobuild/conf/drupal-fix-404s.conf diff --git a/dbd-autobuild/conf/redirect-domains.conf b/drupal-configs/dbd-autobuild/conf/redirect-domains.conf similarity index 100% rename from dbd-autobuild/conf/redirect-domains.conf rename to drupal-configs/dbd-autobuild/conf/redirect-domains.conf diff --git a/dbd-autobuild/files/RELEASE b/drupal-configs/dbd-autobuild/files/RELEASE similarity index 100% rename from dbd-autobuild/files/RELEASE rename to drupal-configs/dbd-autobuild/files/RELEASE diff --git a/dbd-autobuild/files/do-mysql.sh b/drupal-configs/dbd-autobuild/files/do-mysql.sh similarity index 100% rename from dbd-autobuild/files/do-mysql.sh rename to drupal-configs/dbd-autobuild/files/do-mysql.sh diff --git a/dbd-autobuild/files/install-drupal-toolchain.sh b/drupal-configs/dbd-autobuild/files/install-drupal-toolchain.sh similarity index 100% rename from dbd-autobuild/files/install-drupal-toolchain.sh rename to drupal-configs/dbd-autobuild/files/install-drupal-toolchain.sh diff --git a/dbd-autobuild/files/install-packages.sh b/drupal-configs/dbd-autobuild/files/install-packages.sh similarity index 100% rename from dbd-autobuild/files/install-packages.sh rename to drupal-configs/dbd-autobuild/files/install-packages.sh diff --git a/dbd-autobuild/files/pkgs b/drupal-configs/dbd-autobuild/files/pkgs similarity index 100% rename from dbd-autobuild/files/pkgs rename to drupal-configs/dbd-autobuild/files/pkgs diff --git a/dbd-autobuild/files/sqldefaults b/drupal-configs/dbd-autobuild/files/sqldefaults similarity index 100% rename from dbd-autobuild/files/sqldefaults rename to drupal-configs/dbd-autobuild/files/sqldefaults diff --git a/drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf b/drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf new file mode 100644 index 0000000..42e0410 --- /dev/null +++ b/drupal-configs/shopserver/sites-enabled/01-shopserver0p.fsf.org.conf @@ -0,0 +1,76 @@ +################################################################## + + ServerName shopserver0p.fsf.org + ServerAlias shop.fsf.org + ServerAlias store.fsf.org + ServerAdmin webmaster@localhost + DocumentRoot /var/www/shopserver0p.fsf.org + RewriteEngine on + RewriteCond %{HTTPS} off + RewriteCond %{REQUEST_URI} !=/server-status + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log + CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined + +################################################################## + +################################################################## + + ServerName shopserver0p.fsf.org + ServerAlias shop.fsf.org + ServerAlias store.fsf.org + DocumentRoot /var/www/shopserver0p.fsf.org + RewriteEngine On + ServerSignature On + AddType image/x-icon .ico + SSLEngine on + + include /etc/apache2/sites-available/ssl-common.conf + + SSLCertificateFile /etc/letsencrypt/live/shop.fsf.org/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/shop.fsf.org/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/shop.fsf.org/chain.pem + + + + Options Indexes FollowSymLinks MultiViews + AllowOverride All + Satisfy all + Order deny,allow + allow from all + #allow from 127.0.0.1 74.94.156.210 74.94.156.211 + + + Alias /shop-reports /srv/shop-reports + + AllowOverride none + Order deny,allow + allow from all + #Deny from all + #Allow from 127.0.0.1 74.94.156.210 74.94.156.211 + + + + Order deny,allow + Deny from all + Allow from 127.0.0.1 74.94.156.210 74.94.156.211 209.51.188.193 + + + + Order deny,allow + Deny from all + Allow from 127.0.0.1 74.94.156.210 74.94.156.211 + + + Include /etc/apache2/sites-available/shop.fsf.org-common + + + ErrorDocument 403 /403.html + + LogFormat "%{X-Forwarded-for}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" cached + + ErrorLog /var/log/apache2/http-shopserver0p.fsf.org.error.log + CustomLog /var/log/apache2/http-shopserver0p.fsf.org.access.log combined + + +################################################################## diff --git a/drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf b/drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf new file mode 100644 index 0000000..a002282 --- /dev/null +++ b/drupal-configs/shopserver/sites-enabled/02-gnupress.org.conf @@ -0,0 +1,39 @@ +################################################################## + + ServerName gnupress.org + ServerAlias gnupress.com + ServerAlias www.gnupress.org + ServerAlias www.gnupress.com + ServerAdmin webmaster@localhost + + Include /etc/apache2/sites-available/gnupress.org-common + + ErrorLog /var/log/apache2/http-gnupress.org.error.log + CustomLog /var/log/apache2/http-gnupress.org.access.log combined + +################################################################## + +################################################################## + + ServerName gnupress.org + ServerAlias gnupress.com + ServerAlias www.gnupress.org + ServerAlias www.gnupress.com + ServerAdmin webmaster@localhost + + SSLEngine on + + include /etc/apache2/sites-available/ssl-common.conf + + SSLCertificateFile /etc/letsencrypt/live/shop.fsf.org/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/shop.fsf.org/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/shop.fsf.org/chain.pem + + + Include /etc/apache2/sites-available/gnupress.org-common + + + ErrorLog /var/log/apache2/http-gnupress.org.error.log + CustomLog /var/log/apache2/http-gnupress.org.access.log combined + +################################################################## -- 2.25.1