[damned-lies] chore: reduce indent and drop comment in http_conf
- From: Guillaume Bernard <gbernard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [damned-lies] chore: reduce indent and drop comment in http_conf
- Date: Tue, 10 May 2022 08:30:03 +0000 (UTC)
commit 9603cafec226437ca34ff18069b3f8b00e0832ec
Author: Guillaume Bernard <contact guillaume-bernard fr>
Date: Tue May 10 09:34:41 2022 +0200
chore: reduce indent and drop comment in http_conf
.../production/configuration/httpd.conf.jinja2 | 91 +++++++++++-----------
1 file changed, 45 insertions(+), 46 deletions(-)
---
diff --git a/containers/production/configuration/httpd.conf.jinja2
b/containers/production/configuration/httpd.conf.jinja2
index d6ebf1c5..7b876cc8 100644
--- a/containers/production/configuration/httpd.conf.jinja2
+++ b/containers/production/configuration/httpd.conf.jinja2
@@ -1,51 +1,50 @@
<VirtualHost _default_:8080>
- Alias /HTML {{ damned_lies_data_directory }}/scratchdir/HTML
- Alias /POT {{ damned_lies_data_directory }}/scratchdir/POT
- Alias /static {{ damned_lies_project_directory }}/static
- Alias /media {{ damned_lies_data_directory }}/media
- Alias /robots.txt {{ damned_lies_project_directory }}/static/robots.txt
-
- # mod_wsgi
- WSGIDaemonProcess {{ process.user.name }} display-name=%{GROUP} processes=4 home={{ process.user.home }}
python-home={{ process.virtual_env }} python-path={{ damned_lies_project_directory }} user={{
process.user.name }} group={{ process.user.group }}
- WSGIProcessGroup {{ process.user.group }}
- WSGIScriptAlias / {{ damned_lies_project_directory }}/damnedlies/wsgi.py
-
- # Map .po and .pot files accordingly to the correct Content-Type,
- # and also make sure they are rendered as utf-8.
- AddCharset UTF-8 .po
- AddCharset UTF-8 .pot
- AddType text/plain .po
- AddType text/plain .pot
-
- <Directory "{{ damned_lies_project_directory }}">
- Require expr %{HTTP_HOST} == "l10n.gnome.org"
- Require expr %{HTTP_HOST} == "damned-lies-staging.apps.openshift4.gnome.org"
- Require expr %{HTTP_HOST} == "damned-lies-testing.apps.openshift4.gnome.org"
- </Directory>
-
- <DirectoryMatch "{{ damned_lies_project_directory }}/(static|damnedlies)">
- Options Indexes
- Require all granted
- </DirectoryMatch>
-
- <Directory "{{ damned_lies_data_directory }}/media">
- Options Indexes
- Require all granted
- </Directory>
-
- <DirectoryMatch "^{{ damned_lies_data_directory }}/scratchdir/(POT|HTML)">
- Options Indexes
- <RequireAll>
- Require all granted
- Require not ip 95.108.249.30
- Require not ip 218.30.103.149
- Require not ip 65.55.24.217
- Require not ip 180.76.5.0/24
- Require not ip 218.30.103.0/24
- Require not ip 1.202.219.0/24
- </RequireAll>
- </DirectoryMatch>
+ Alias /HTML {{ damned_lies_data_directory }}/scratchdir/HTML
+ Alias /POT {{ damned_lies_data_directory }}/scratchdir/POT
+ Alias /static {{ damned_lies_project_directory }}/static
+ Alias /media {{ damned_lies_data_directory }}/media
+ Alias /robots.txt {{ damned_lies_project_directory }}/static/robots.txt
+
+ WSGIDaemonProcess {{ process.user.name }} display-name=%{GROUP} processes=4 home={{ process.user.home }}
python-home={{ process.virtual_env }} python-path={{ damned_lies_project_directory }} user={{
process.user.name }} group={{ process.user.group }}
+ WSGIProcessGroup {{ process.user.group }}
+ WSGIScriptAlias / {{ damned_lies_project_directory }}/damnedlies/wsgi.py
+
+ # Map .po and .pot files accordingly to the correct Content-Type,
+ # and also make sure they are rendered as utf-8.
+ AddCharset UTF-8 .po
+ AddCharset UTF-8 .pot
+ AddType text/plain .po
+ AddType text/plain .pot
+
+ <Directory "{{ damned_lies_project_directory }}">
+ Require expr %{HTTP_HOST} == "l10n.gnome.org"
+ Require expr %{HTTP_HOST} == "damned-lies-staging.apps.openshift4.gnome.org"
+ Require expr %{HTTP_HOST} == "damned-lies-testing.apps.openshift4.gnome.org"
+ </Directory>
+
+ <DirectoryMatch "{{ damned_lies_project_directory }}/(static|damnedlies)">
+ Options Indexes
+ Require all granted
+ </DirectoryMatch>
+
+ <Directory "{{ damned_lies_data_directory }}/media">
+ Options Indexes
+ Require all granted
+ </Directory>
+
+ <DirectoryMatch "^{{ damned_lies_data_directory }}/scratchdir/(POT|HTML)">
+ Options Indexes
+ <RequireAll>
+ Require all granted
+ Require not ip 95.108.249.30
+ Require not ip 218.30.103.149
+ Require not ip 65.55.24.217
+ Require not ip 180.76.5.0/24
+ Require not ip 218.30.103.0/24
+ Require not ip 1.202.219.0/24
+ </RequireAll>
+ </DirectoryMatch>
</VirtualHost>
<LocationMatch "^/vertimus">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]