From: Ansgar Burchardt Date: Sun, 17 May 2015 10:12:51 +0000 (+0200) Subject: apache.conf: merge changes from upgrade to Debian 8 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3cf22306574444cbc63616006e6e6433c3fc0aac;p=dak.git apache.conf: merge changes from upgrade to Debian 8 --- diff --git a/config/debian/apache.conf-api b/config/debian/apache.conf-api index 6333fd8c..cff9df6a 100644 --- a/config/debian/apache.conf-api +++ b/config/debian/apache.conf-api @@ -10,6 +10,11 @@ DocumentRoot /srv/ftp-master.debian.org/export + + + Require all granted + + WSGIDaemonProcess api.ftp-master.debian.org user=dak-web group=dak-web processes=1 threads=5 WSGIScriptAlias / /srv/ftp-master.debian.org/dak/dakweb/dakweb.wsgi diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp index 3f40a451..72a73b9a 100644 --- a/config/debian/apache.conf-ftp +++ b/config/debian/apache.conf-ftp @@ -16,13 +16,13 @@ Use common-debian-service-https-redirect * ftp-master.debian.org Alias /users/ /srv/ftp.debian.org/web-users/ - Order allow,deny - Allow from All + Require all granted AllowOverride FileInfo AuthConfig Limit Indexes Options MultiViews Indexes SymLinksIfOwnerMatch + Require all granted AddCharset utf-8 .txt