Skip to content
Snippets Groups Projects
Commit 611f3cef authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-recipes

parents 7ddcb293 97797a27
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 42 deletions
init/systemd/gitlab-sidekiq.service
+ 1
− 1
View file @ 611f3cef
@@ -20,7 +20,7 @@ Environment=RAILS_ENV=production
SyslogIdentifier=gitlab-sidekiq
PIDFile=/home/git/gitlab/tmp/pids/sidekiq.pid
 
ExecStart=/usr/bin/bundle exec "sidekiq -d -q archive_repo -q post_receive -q mailers -q system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q default -e production -P tmp/pids/sidekiq.pid -d -L log/sidekiq.log >> log/sidekiq.log 2>&1"
ExecStart=/usr/bin/bundle exec "sidekiq -C config/sidekiq_queues.yml -c 5 -e production -P tmp/pids/sidekiq.pid -d -L log/sidekiq.log >> log/sidekiq.log 2>&1"
ExecStop=/usr/bin/bundle exec "sidekiqctl stop /home/git/gitlab/tmp/pids/sidekiq.pid >> /home/git/gitlab/log/sidekiq.log 2>&1"
 
[Install]
web-server/apache/README.md
+ 1
− 1
View file @ 611f3cef
@@ -3,7 +3,7 @@
The configuration files in this directory are known to work with GitLab 8.3
and newer versions.
 
Fir versions of GitLab 8.2, check the `8-2-stable` branch.
For versions of GitLab 8.2, check the `8-2-stable` branch.
For versions of GitLab 8.0 and 8.1, check the `8-1-stable` branch.
For versions of GitLab older than 8.0, check the `apache-old` branch.
 
web-server/apache/gitlab-apache22.conf
+ 1
− 5
View file @ 611f3cef
@@ -33,14 +33,10 @@
# http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
RewriteEngine on
 
#Don't escape encoded characters in api requests
RewriteCond %{REQUEST_URI} ^/api/v3/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
#Forward all requests to gitlab-workhorse except existing files like error documents
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
# needed for downloading attachments
DocumentRoot /home/git/gitlab/public
web-server/apache/gitlab-apache24.conf
+ 1
− 5
View file @ 611f3cef
@@ -34,14 +34,10 @@
# http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
RewriteEngine on
 
#Don't escape encoded characters in api requests
RewriteCond %{REQUEST_URI} ^/api/v3/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
#Forward all requests to gitlab-workhorse except existing files like error documents
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
# needed for downloading attachments
DocumentRoot /home/git/gitlab/public
web-server/apache/gitlab-omnibus-apache22.conf
+ 1
− 5
View file @ 611f3cef
@@ -34,14 +34,10 @@
# http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
RewriteEngine on
 
#Don't escape encoded characters in api requests
RewriteCond %{REQUEST_URI} ^/api/v3/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
#Forward all requests to gitlab-workhorse except existing files like error documents
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
# needed for downloading attachments
DocumentRoot /opt/gitlab/embedded/service/gitlab-rails/public
web-server/apache/gitlab-omnibus-apache24.conf
+ 1
− 5
View file @ 611f3cef
@@ -35,14 +35,10 @@
# http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
RewriteEngine on
 
#Don't escape encoded characters in api requests
RewriteCond %{REQUEST_URI} ^/api/v3/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
#Forward all requests to gitlab-workhorse except existing files like error documents
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
# needed for downloading attachments
DocumentRoot /opt/gitlab/embedded/service/gitlab-rails/public
web-server/apache/gitlab-omnibus-ssl-apache22.conf
+ 1
− 5
View file @ 611f3cef
@@ -60,14 +60,10 @@
# http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
RewriteEngine on
 
#Don't escape encoded characters in api requests
RewriteCond %{REQUEST_URI} ^/api/v3/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
#Forward all requests to gitlab-workhorse except existing files like error documents
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
RequestHeader set X_FORWARDED_PROTO 'https'
RequestHeader set X-Forwarded-Ssl on
web-server/apache/gitlab-omnibus-ssl-apache24.conf
+ 1
− 5
View file @ 611f3cef
@@ -61,14 +61,10 @@
# http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
RewriteEngine on
 
#Don't escape encoded characters in api requests
RewriteCond %{REQUEST_URI} ^/api/v3/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
#Forward all requests to gitlab-workhorse except existing files like error documents
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
RequestHeader set X_FORWARDED_PROTO 'https'
RequestHeader set X-Forwarded-Ssl on
web-server/apache/gitlab-ssl-apache22.conf
+ 1
− 5
View file @ 611f3cef
@@ -59,14 +59,10 @@
# http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
RewriteEngine on
 
#Don't escape encoded characters in api requests
RewriteCond %{REQUEST_URI} ^/api/v3/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
#Forward all requests to gitlab-workhorse except existing files like error documents
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
RequestHeader set X_FORWARDED_PROTO 'https'
RequestHeader set X-Forwarded-Ssl on
web-server/apache/gitlab-ssl-apache24.conf
+ 1
− 5
View file @ 611f3cef
@@ -60,14 +60,10 @@
# http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
RewriteEngine on
 
#Don't escape encoded characters in api requests
RewriteCond %{REQUEST_URI} ^/api/v3/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
#Forward all requests to gitlab-workhorse except existing files like error documents
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
RewriteCond %{REQUEST_URI} ^/uploads/.*
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
RequestHeader set X_FORWARDED_PROTO 'https'
RequestHeader set X-Forwarded-Ssl on
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment