jfederico 4 лет назад
Родитель
Сommit
b6b4dac8b5
5 измененных файлов: 11 добавлений и 8 удалений
  1. 4
    4
      docker-compose.yml
  2. 1
    0
      dotenv
  3. 4
    4
      nginx/sites.template
  4. 1
    0
      scalelite/.env
  5. 1
    0
      scalelite/bin/start

+ 4
- 4
docker-compose.yml Просмотреть файл

19
       - "80:80"
19
       - "80:80"
20
       - "443:443"
20
       - "443:443"
21
     environment:
21
     environment:
22
-      - NGINX_DOMAIN=${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
22
+      - NGINX_HOSTNAME=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
23
     depends_on:
23
     depends_on:
24
       - scalelite.api
24
       - scalelite.api
25
-    command: /bin/bash -c "envsubst '$$NGINX_DOMAIN' < /etc/nginx/sites-available/sites.template > /etc/nginx/sites-enabled/sites.conf && exec nginx -g 'daemon off;'"
25
+    command: /bin/bash -c "envsubst '$$NGINX_HOSTNAME' < /etc/nginx/sites-available/sites.template > /etc/nginx/sites-enabled/sites.conf && exec nginx -g 'daemon off;'"
26
 
26
 
27
   redis:
27
   redis:
28
     image: redis
28
     image: redis
49
     env_file: ./scalelite/.env
49
     env_file: ./scalelite/.env
50
     environment:
50
     environment:
51
       - REDIS_URL=redis://redis:6379
51
       - REDIS_URL=redis://redis:6379
52
-      - URL_HOST=sl.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
52
+      - URL_HOST=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
53
 
53
 
54
   scalelite.poller:
54
   scalelite.poller:
55
     entrypoint: [bin/start-poller]
55
     entrypoint: [bin/start-poller]
65
     env_file: ./scalelite/.env
65
     env_file: ./scalelite/.env
66
     environment:
66
     environment:
67
       - REDIS_URL=redis://redis:6379
67
       - REDIS_URL=redis://redis:6379
68
-      - URL_HOST=sl.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
68
+      - URL_HOST=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
69
       - INTERVAL=60
69
       - INTERVAL=60

+ 1
- 0
dotenv Просмотреть файл

1
 DOMAIN_ROOT=bigbluebutton.org
1
 DOMAIN_ROOT=bigbluebutton.org
2
 DOMAIN_SUB=lab
2
 DOMAIN_SUB=lab
3
+HOST_NAME=sl

+ 4
- 4
nginx/sites.template Просмотреть файл

1
-#### For <sl.$NGINX_DOMAIN>
1
+#### For <$NGINX_HOSTNAME>
2
 
2
 
3
 upstream docker-scalelite {
3
 upstream docker-scalelite {
4
     server scalelite.api:3000;
4
     server scalelite.api:3000;
5
 }
5
 }
6
 
6
 
7
 server {
7
 server {
8
-    server_name sl.$NGINX_DOMAIN;
8
+    server_name $NGINX_HOSTNAME;
9
 
9
 
10
     listen 80;
10
     listen 80;
11
     listen [::]:80;
11
     listen [::]:80;
12
     listen 443 ssl;
12
     listen 443 ssl;
13
     listen [::]:443;
13
     listen [::]:443;
14
 
14
 
15
-    ssl_certificate /etc/letsencrypt/live/sl.$NGINX_DOMAIN/fullchain.pem;
16
-    ssl_certificate_key /etc/letsencrypt/live/sl.$NGINX_DOMAIN/privkey.pem;
15
+    ssl_certificate /etc/letsencrypt/live/$NGINX_HOSTNAME/fullchain.pem;
16
+    ssl_certificate_key /etc/letsencrypt/live/$NGINX_HOSTNAME/privkey.pem;
17
 
17
 
18
     location / {
18
     location / {
19
             proxy_pass  http://docker-scalelite;
19
             proxy_pass  http://docker-scalelite;

+ 1
- 0
scalelite/.env Просмотреть файл

1
 SECRET_KEY_BASE=secret_key_base
1
 SECRET_KEY_BASE=secret_key_base
2
 LOADBALANCER_SECRET=8cd8ef52e8e101574e400365b55e11a6
2
 LOADBALANCER_SECRET=8cd8ef52e8e101574e400365b55e11a6
3
+HOST_NAME=sl

+ 1
- 0
scalelite/bin/start Просмотреть файл

10
   bundle exec rake servers:add["https://test-install.blindsidenetworks.com/bigbluebutton/api","8cd8ef52e8e101574e400365b55e11a6"]
10
   bundle exec rake servers:add["https://test-install.blindsidenetworks.com/bigbluebutton/api","8cd8ef52e8e101574e400365b55e11a6"]
11
   bundle exec rake servers
11
   bundle exec rake servers
12
   bundle exec rake status
12
   bundle exec rake status
13
+  echo ">>> Server must be enabled from the console"
13
 else
14
 else
14
   echo ">>> Do nothing"
15
   echo ">>> Do nothing"
15
 fi
16
 fi

Загрузка…
Отмена
Сохранить