archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1146 from phpb-com/master

Browse Source 
Fix faulty nginx config for pages
This commit is contained in:
Niclas Mietz 2017-03-24 14:51:03 +01:00 committed by GitHub
commit aeb149abf2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/runtime/config/nginx/gitlab-pages
View File

@ -3,7 +3,7 @@
## Pages serving host
server {
listen 0.0.0.0:80;
listen [::]:80 ipv6only=on;
listen [::]:80;
## Replace this with something like pages.gitlab.com
server_name ~^.*{{GITLAB_PAGES_DOMAIN}};
## Individual nginx logs for GitLab pages
@ -20,4 +20,4 @@ server {
# Define custom error pages
error_page 403 /403.html;
error_page 404 /404.html;
}
}

8
assets/runtime/config/nginx/gitlab-pages-ssl
View File

@ -8,7 +8,7 @@ server {
## to be served if you visit any address that your server responds to, eg.
## the ip address of the server (http://x.x.x.x/)
listen 0.0.0.0:80;
listen [::]:80 ipv6only=on;
listen [::]:80;
## Replace this with something like pages.gitlab.com
server_name ~^.*{{GITLAB_PAGES_DOMAIN}};
@ -32,8 +32,8 @@ server {
## Strong SSL Security
## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
ssl on;
ssl_certificate {{SSL_CERTIFICATE_PATH}};
ssl_certificate_key {{SSL_KEY_PATH}};
ssl_certificate {{SSL_PAGES_CERT_PATH}};
ssl_certificate_key {{SSL_PAGES_KEY_PATH}};
# GitLab needs backwards compatible ciphers to retain compatibility with Java IDEs
ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
@ -74,4 +74,4 @@ server {
# Define custom error pages
error_page 403 /403.html;
error_page 404 /404.html;
}
}

1
assets/runtime/functions
View File

@ -1022,6 +1022,7 @@ nginx_configure_pages(){
echo "Configuring nginx::gitlab-pages..."
if [[ ${GITLAB_PAGES_HTTPS} == true ]]; then
update_template ${GITLAB_PAGES_NGINX_CONFIG} \
GITLAB_PORT \
GITLAB_PAGES_DOMAIN \
GITLAB_PAGES_PORT \
GITLAB_LOG_DIR \