projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
create /srv/static.debian.org/master static-masters
[mirror/dsa-puppet.git]
/
modules
/
salsa
/
templates
/
apache-salsa.debian.org.conf.erb
diff --git
a/modules/salsa/templates/apache-salsa.debian.org.conf.erb
b/modules/salsa/templates/apache-salsa.debian.org.conf.erb
index
a417e8e
..
176db7e
100644
(file)
--- a/
modules/salsa/templates/apache-salsa.debian.org.conf.erb
+++ b/
modules/salsa/templates/apache-salsa.debian.org.conf.erb
@@
-12,17
+12,20
@@
Use common-debian-service-https-redirect * salsa.debian.org
CustomLog /var/log/apache2/salsa.debian.org-access.log privacy
DocumentRoot /srv/salsa.debian.org/gitlab/public
CustomLog /var/log/apache2/salsa.debian.org-access.log privacy
DocumentRoot /srv/salsa.debian.org/gitlab/public
+ <Directory /srv/salsa.debian.org/gitlab/public>
+ Require all granted
+ </Directory>
ProxyPreserveHost On
AllowEncodedSlashes NoDecode
ProxyPreserveHost On
AllowEncodedSlashes NoDecode
- ProxyPassReverse
http://127.0.0.1:8080
/
- ProxyPassReverse http://salsa.debian.org/
+ ProxyPassReverse
/ http://127.0.0.1:8181
/
+ ProxyPassReverse
/
http://salsa.debian.org/
RewriteEngine on
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteEngine on
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
- RewriteRule .* http://127.0.0.1:8
080
%{REQUEST_URI} [P,QSA,NE]
+ RewriteRule .* http://127.0.0.1:8
181
%{REQUEST_URI} [P,QSA,NE]
RequestHeader set X_FORWARDED_PROTO 'https'
RequestHeader set X-Forwarded-Ssl on
RequestHeader set X_FORWARDED_PROTO 'https'
RequestHeader set X-Forwarded-Ssl on