Browse Source

tests with gitlab

Guilhem Saurel 7 years ago
parent
commit
0f08bdfc79
2 changed files with 9 additions and 4 deletions
  1. 6 3
      README.md
  2. 3 1
      gitlab/docker-compose.yml

+ 6 - 3
README.md

@@ -13,7 +13,6 @@
 cd etherpad
 export MYSQL_ROOT_PASSWORD=$(openssl rand -base64 32)
 ln -s $PWD/nginx.conf /etc/nginx/sites-enabled/etherpad
-systemctl restart nginx
 certbot certonly --email <me souviens plus> --webroot -w /srv/letsencrypt/ --agree-tos -d www.pad.oxyta.net -d pad.oxyta.net
 docker-compose up -d
 ```
@@ -26,7 +25,6 @@ cd nextcloud
 export MYSQL_ROOT_PASSWORD=$(openssl rand -base64 32)
 export MYSQL_PASSWORD=$(openssl rand -base64 32)
 ln -s $PWD/nginx.conf /etc/nginx/sites-enabled/nextcloud
-systemctl restart nginx
 certbot certonly --email <me souviens plus> --webroot -w /srv/letsencrypt/ --agree-tos -d www.cloud.oxyta.net -d cloud.oxyta.net
 docker-compose up -d
 ```
@@ -36,7 +34,12 @@ docker-compose up -d
 ```
 cd gitlab
 ln -s $PWD/nginx.conf /etc/nginx/sites-enabled/gitlab
-systemctl restart nginx
 certbot certonly --email <me souviens plus> --webroot -w /srv/letsencrypt/ --agree-tos -d www.git.oxyta.net -d git.oxyta.net
 docker-compose up -d
 ```
+
+## After
+
+```
+systemctl restart nginx
+```

+ 3 - 1
gitlab/docker-compose.yml

@@ -3,6 +3,9 @@ version: '2'
 services:
   app:
     image: gitlab/gitlab-ce
+    hostname: 'git.aen.im'
+    environment:
+      - GITLAB_OMNIBUS_CONFIG="external_url https://git.aen.im"
     volumes:
       - /srv/gitlab/app/config:/etc/gitlab
       - /srv/gitlab/app/logs:/var/log/gitlab
@@ -10,4 +13,3 @@ services:
     restart: always
     ports:
       - "127.0.0.1:9002:80"
-      - "127.0.0.1:8999:22"