From 026e04e57fa71257aa3778c36700fba86c10b339 Mon Sep 17 00:00:00 2001 From: Mathieu Sanchez Date: Mon, 8 Apr 2019 14:09:09 +0900 Subject: [PATCH] Change gitlab for gitla beacause too many certificat ask --- docker/conf/applications/gitlab.c2a-systeme.fr.conf | 8 ++++---- docker/install-gitlab.sh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/conf/applications/gitlab.c2a-systeme.fr.conf b/docker/conf/applications/gitlab.c2a-systeme.fr.conf index ecbf25d..5c6b8c9 100644 --- a/docker/conf/applications/gitlab.c2a-systeme.fr.conf +++ b/docker/conf/applications/gitlab.c2a-systeme.fr.conf @@ -9,7 +9,7 @@ server { listen 80; listen [::]:80; - server_name gitlab.teksatcau.fr; + server_name gitla.teksatcau.fr; location / { # redirect everything to HTTPS @@ -19,14 +19,14 @@ server { # https server server { - server_name gitlab.teksatcau.fr; + server_name gitla.teksatcau.fr; listen 443 http2; listen [::]:443 http2; ssl on; # paths are relative to prefix and not to this file - ssl_certificate /etc/letsencrypt/live/gitlab.teksatcau.fr/cert.pem; - ssl_certificate_key /etc/letsencrypt/live/gitlab.teksatcau.fr/privkey.pem; + ssl_certificate /etc/letsencrypt/live/gitla.teksatcau.fr/cert.pem; + ssl_certificate_key /etc/letsencrypt/live/gitla.teksatcau.fr/privkey.pem; ssl_session_timeout 5m; ssl_session_cache shared:SSL:50m; diff --git a/docker/install-gitlab.sh b/docker/install-gitlab.sh index 08b279d..24c900e 100755 --- a/docker/install-gitlab.sh +++ b/docker/install-gitlab.sh @@ -1,14 +1,14 @@ +# --env GITLAB_OMNIBUS_CONFIG="external_url 'https://gitla.teksatcau.fr/';gitlab_rails['gitlab_shell_ssh_port'] = 2201; nginx['ssl_certificate'] = '/etc/gitlab/ssl/gitlab.c2a-systeme.fr.crt'; nginx['ssl_certificate_key'] = '/etc/gitlab/ssl/gitlab.c2a-systeme.fr.key'" \ # --env GITLAB_OMNIBUS_CONFIG="external_url 'http://gitlab.c2a-systeme.dev/'; gitlab_rails['gitlab_shell_ssh_port'] = 2201;" \ +# --volume /etc/letsencrypt/live/gitla.teksatcau.fr/cert.pem:/etc/gitlab/ssl/gitlab.c2a-systeme.fr.crt \ +# --volume /etc/letsencrypt/live/gitla.teksatcau.fr/privkey.pem:/etc/gitlab/ssl/gitlab.c2a-systeme.fr.key \ docker run --detach \ --name gitlab \ - --publish 8001:443 \ + --publish 8001:80 \ --publish 2201:22 \ - --hostname gitlab.teksatcau.fr \ - --env GITLAB_OMNIBUS_CONFIG="external_url 'https://gitla.teksatcau.fr/';gitlab_rails['gitlab_shell_ssh_port'] = 2201; nginx['ssl_certificate'] = '/etc/gitlab/ssl/gitlab.c2a-systeme.fr.crt'; nginx['ssl_certificate_key'] = '/etc/gitlab/ssl/gitlab.c2a-systeme.fr.key'" \ + --hostname gitla.teksatcau.fr \ --volume /srv/gitlab/config:/etc/gitlab \ --volume /srv/gitlab/logs:/var/log/gitlab \ --volume /srv/gitlab/data:/var/opt/gitlab \ - --volume /etc/letsencrypt/live/gitla.teksatcau.fr/cert.pem:/etc/gitlab/ssl/gitlab.c2a-systeme.fr.crt \ - --volume /etc/letsencrypt/live/gitla.teksatcau.fr/privkey.pem:/etc/gitlab/ssl/gitlab.c2a-systeme.fr.key \ --restart unless-stopped \ gitlab/gitlab-ce:latest