소스 검색

Simplified use of HOST_NAME

master
jfederico 4 년 전
부모
커밋
9869c53d18
4개의 변경된 파일13개의 추가작업 그리고 9개의 파일을 삭제
  1. 1
    2
      README.md
  2. 8
    3
      docker-compose.yml
  3. 1
    3
      dotenv
  4. 3
    1
      init-letsencrypt.sh

+ 1
- 2
README.md 파일 보기

@@ -16,8 +16,7 @@ using docker-compose.
16 16
 
17 17
   - [scalelite](https://cloud.docker.com/u/blindsidenetwks/repository/docker/blindsidenetwks/scalelite)
18 18
 
19
-- Make sure you have your own DNS and a public domain name or a delegated one under blindside-dev.com
20
-  (e.g. <JOHN>.blindside-dev.com)
19
+- Make sure you have your own DNS and a public domain name or a delegated one (e.g. <JOHN>.blindside-dev.com).
21 20
 
22 21
 
23 22
 ## Preliminary steps

+ 8
- 3
docker-compose.yml 파일 보기

@@ -20,11 +20,12 @@ services:
20 20
       - "80:80"
21 21
       - "443:443"
22 22
     environment:
23
-      - NGINX_HOSTNAME=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
23
+      - NGINX_HOSTNAME=${HOST_NAME:-sl.xlab.blindside-dev.com}
24 24
     depends_on:
25 25
       - scalelite.api
26 26
     command: /bin/bash -c "envsubst '$$NGINX_HOSTNAME' < /etc/nginx/sites-available/sites.template > /etc/nginx/sites-enabled/sites.conf && while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g 'daemon off;'"
27 27
 
28
+
28 29
   certbot:
29 30
     image: certbot/certbot
30 31
     volumes:
@@ -32,6 +33,7 @@ services:
32 33
       - ./data/certbot/www:/var/www/certbot
33 34
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
34 35
 
36
+
35 37
   redis:
36 38
     image: redis
37 39
     restart: "no"
@@ -40,6 +42,7 @@ services:
40 42
     volumes:
41 43
       - ./data/redis/:/data
42 44
 
45
+
43 46
   postgres:
44 47
     image: postgres:9.5
45 48
     restart: "no"
@@ -53,6 +56,7 @@ services:
53 56
       - PGUSER=postgres
54 57
       - PGPASSWORD=password
55 58
 
59
+
56 60
   scalelite.api:
57 61
     entrypoint: [bin/start]
58 62
     image: blindsidenetwks/scalelite:master
@@ -76,7 +80,8 @@ services:
76 80
       - DB_NAME=scalelite_production
77 81
       - DB_USERNAME=postgres
78 82
       - DB_PASSWORD=password
79
-      - URL_HOST=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
83
+      - URL_HOST=${HOST_NAME:-sl.xlab.blindside-dev.com}
84
+
80 85
 
81 86
   scalelite.poller:
82 87
     entrypoint: [bin/start-poller]
@@ -92,5 +97,5 @@ services:
92 97
     env_file: ./scalelite/.env
93 98
     environment:
94 99
       - REDIS_URL=redis://redis:6379
95
-      - URL_HOST=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
100
+      - URL_HOST=${HOST_NAME:-sl.xlab.blindside-dev.com}
96 101
       - INTERVAL=60

+ 1
- 3
dotenv 파일 보기

@@ -1,3 +1 @@
1
-DOMAIN_ROOT=bigbluebutton.org
2
-DOMAIN_SUB=lab
3
-HOST_NAME=sl
1
+HOST_NAME=sl.xlab.blindside-dev.com

+ 3
- 1
init-letsencrypt.sh 파일 보기

@@ -5,7 +5,9 @@ if ! [ -x "$(command -v docker-compose)" ]; then
5 5
   exit 1
6 6
 fi
7 7
 
8
-domains=(example.org www.example.org)
8
+HOST_NAME=$(grep HOST_NAME .env | cut -d '=' -f2)
9
+
10
+domains=($HOST_NAME)
9 11
 rsa_key_size=4096
10 12
 data_path="./data/certbot"
11 13
 email="" # Adding a valid address is strongly recommended

Loading…
취소
저장