diff options
| author | jfederico <jesus@123it.ca> | 2020-02-11 15:34:12 -0500 |
|---|---|---|
| committer | jfederico <jesus@123it.ca> | 2020-02-11 15:57:35 -0500 |
| commit | b6b4dac8b5d6fa255fa96acbee41046b372d6ff7 (patch) | |
| tree | 126d895e6eb1c50be80bb49b06d6b5c441c483a5 | |
| parent | 675f8f6f27aad39531475d68c7d36d4a16ef8e8f (diff) | |
| download | scalelite-run-itzks-b6b4dac8b5d6fa255fa96acbee41046b372d6ff7.tar.gz scalelite-run-itzks-b6b4dac8b5d6fa255fa96acbee41046b372d6ff7.tar.bz2 scalelite-run-itzks-b6b4dac8b5d6fa255fa96acbee41046b372d6ff7.zip | |
Generalized hostname
| -rw-r--r-- | docker-compose.yml | 8 | ||||
| -rw-r--r-- | dotenv | 1 | ||||
| -rw-r--r-- | nginx/sites.template | 8 | ||||
| -rw-r--r-- | scalelite/.env | 1 | ||||
| -rwxr-xr-x | scalelite/bin/start | 1 |
5 files changed, 11 insertions, 8 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 47dd02c..2d7150f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,10 +19,10 @@ services: - "80:80" - "443:443" environment: - - NGINX_DOMAIN=${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org} + - NGINX_HOSTNAME=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org} depends_on: - scalelite.api - command: /bin/bash -c "envsubst '$$NGINX_DOMAIN' < /etc/nginx/sites-available/sites.template > /etc/nginx/sites-enabled/sites.conf && exec nginx -g 'daemon off;'" + command: /bin/bash -c "envsubst '$$NGINX_HOSTNAME' < /etc/nginx/sites-available/sites.template > /etc/nginx/sites-enabled/sites.conf && exec nginx -g 'daemon off;'" redis: image: redis @@ -49,7 +49,7 @@ services: env_file: ./scalelite/.env environment: - REDIS_URL=redis://redis:6379 - - URL_HOST=sl.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org} + - URL_HOST=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org} scalelite.poller: entrypoint: [bin/start-poller] @@ -65,5 +65,5 @@ services: env_file: ./scalelite/.env environment: - REDIS_URL=redis://redis:6379 - - URL_HOST=sl.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org} + - URL_HOST=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org} - INTERVAL=60 @@ -1,2 +1,3 @@ DOMAIN_ROOT=bigbluebutton.org DOMAIN_SUB=lab +HOST_NAME=sl diff --git a/nginx/sites.template b/nginx/sites.template index d39f4ef..ba3c04e 100644 --- a/nginx/sites.template +++ b/nginx/sites.template @@ -1,19 +1,19 @@ -#### For <sl.$NGINX_DOMAIN> +#### For <$NGINX_HOSTNAME> upstream docker-scalelite { server scalelite.api:3000; } server { - server_name sl.$NGINX_DOMAIN; + server_name $NGINX_HOSTNAME; listen 80; listen [::]:80; listen 443 ssl; listen [::]:443; - ssl_certificate /etc/letsencrypt/live/sl.$NGINX_DOMAIN/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/sl.$NGINX_DOMAIN/privkey.pem; + ssl_certificate /etc/letsencrypt/live/$NGINX_HOSTNAME/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$NGINX_HOSTNAME/privkey.pem; location / { proxy_pass http://docker-scalelite; diff --git a/scalelite/.env b/scalelite/.env index 432afd5..21d461e 100644 --- a/scalelite/.env +++ b/scalelite/.env @@ -1,2 +1,3 @@ SECRET_KEY_BASE=secret_key_base LOADBALANCER_SECRET=8cd8ef52e8e101574e400365b55e11a6 +HOST_NAME=sl diff --git a/scalelite/bin/start b/scalelite/bin/start index 3840ee7..4c19e52 100755 --- a/scalelite/bin/start +++ b/scalelite/bin/start @@ -10,6 +10,7 @@ if [ "$(echo "$servers" | cut -c0-2)" == "No" ]; then bundle exec rake servers:add["https://test-install.blindsidenetworks.com/bigbluebutton/api","8cd8ef52e8e101574e400365b55e11a6"] bundle exec rake servers bundle exec rake status + echo ">>> Server must be enabled from the console" else echo ">>> Do nothing" fi |