nuttycom/aftok - Change NSRSSSTRMJPPUYQANYDWGI5D3NVM6RQEVZCDUUNQAOL3OWQTD27AC

Update nginx.conf, make aftok host configurable for cli scripts.

Created by Kris Nuttycombe on June 5, 2020

NSRSSSTRMJPPUYQANYDWGI5D3NVM6RQEVZCDUUNQAOL3OWQTD27AC

Dependencies

In channels

main

Change contents

Replacement in deploy/nginx/nginx.conf at line 21 [4.200]

B:BD[4.400] → [4.400:457]

    listen 80;
    return 301 https://$host$request_uri;

[4.400]

[4.457]

    listen 80 default_server;
    location / {
      root /opt/static;
      index index.html;
    }

Replacement in deploy/nginx/nginx.conf at line 30 [4.200]
B:BD[4.473] → [3.1750:1770]
```
    listen 443 ssl;
```
[4.473]
[4.489]
```
    listen 443 ssl default_server;
```
Insertion in deploy/nginx/nginx.conf at line 39 [4.200]
[3.1944]
[4.837]
```
    ssl_prefer_server_ciphers on;
```

Replacement in deploy/nginx/nginx.conf at line 41 [4.200]

B:BD[4.838] → [4.838:899]

    access_log            /var/log/nginx/jenkins.access.log;

[4.838]

[4.899]

    access_log            /var/log/nginx/access.log;

Insertion in deploy/nginx/nginx.conf at line 44 [4.200]

[4.917]

      root /opt/static;
      index index.html;
    }
    location /api/ {

Replacement in deploy/nginx/nginx.conf at line 55 [4.200]

B:BD[4.1224] → [3.1945:1996]

      proxy_pass              http://aftok-server;

[4.1224]

[3.1996]

      proxy_pass              http://aftok-server/;

Replacement in deploy/nginx/nginx.conf at line 58 [4.200]

B:BD[4.1304] → [3.2031:2100]

      proxy_redirect          http://aftok-server https://aftok.com;

[4.1304]

[4.1371]

      proxy_redirect          http://aftok-server https://$host:$server_port/;

Insertion in docker-compose.yml at line 48 [3.23741]

[3.24689]

      - type: bind
        source: ${PWD}/local/db-dumps
        target: /opt/

Insertion in scripts/create_project.sh at line 5 [6.1241]
[5.47]
[5.47]
```
fi
if [ -z "${AFTOK_HOST}" ]; then 
  AFTOK_HOST="aftok.com"
```
Replacement in scripts/create_project.sh at line 38 [6.1241]
B:BD[5.465] → [2.2:37]
```
  'https://aftok.com/api/projects'
```
[5.465]
[6.1379]
```
  "https://$AFTOK_HOST/api/projects"
```

Insertion in scripts/create_user.sh at line 2 [6.1424]

[6.1437]


if [ -f ".env" ]; then
  source .env
fi
if [ -z "${AFTOK_HOST}" ]; then 
  AFTOK_HOST="aftok.com"
fi

Replacement in scripts/create_user.sh at line 20 [6.1424]
B:BD[7.618] → [2.39:74]
```
  'https://aftok.com/api/register'
```
[7.618]
[6.1648]
```
  "https://$AFTOK_HOST/api/register"
```

Insertion in scripts/invite.sh at line 5 [8.1]

[5.505]

fi
if [ -z "${AFTOK_HOST}" ]; then 
  AFTOK_HOST="aftok.com"

Replacement in scripts/invite.sh at line 27 [8.1]

B:BD[9.18] → [2.76:136]

  "https://aftok.com/api/projects/$PID/invite?email=$EMAIL"

[9.18]

  "https://$AFTOK_HOST/api/projects/$PID/invite?email=$EMAIL"

Insertion in scripts/list_projects.sh at line 5 [10.1]
[5.706]
[5.706]
```
fi
if [ -z "${AFTOK_HOST}" ]; then 
  AFTOK_HOST="aftok.com"
```
Replacement in scripts/list_projects.sh at line 17 [10.1]
B:BD[7.862] → [7.862:880]
B:BD[7.880] → [2.138:173]
```
  --request GET \
  "https://aftok.com/api/projects"
```
[7.862]
```
  "https://$AFTOK_HOST/api/projects"
```

Insertion in scripts/log.sh at line 5 [10.176]

[5.814]

fi
if [ -z "${AFTOK_HOST}" ]; then 
  AFTOK_HOST="aftok.com"

Replacement in scripts/log.sh at line 29 [10.176]

B:BD[7.972] → [2.221:287]

  "https://aftok.com/api/projects/$PID/logEntries?after=${after}"

[7.972]

  "https://$AFTOK_HOST/api/projects/$PID/logEntries?after=${after}"

Insertion in scripts/log_end.sh at line 5 [11.532]

[5.989]

fi
if [ -z "${AFTOK_HOST}" ]; then 
  AFTOK_HOST="aftok.com"

Replacement in scripts/log_end.sh at line 24 [11.532]

B:BD[7.1202] → [2.289:337]

  "https://aftok.com/api/projects/$PID/logEnd"

[7.1202]

  "https://$AFTOK_HOST/api/projects/$PID/logEnd"

Insertion in scripts/log_start.sh at line 5 [11.689]
[5.1164]
[5.1164]
```
fi
if [ -z "${AFTOK_HOST}" ]; then 
  AFTOK_HOST="aftok.com"
```

Replacement in scripts/log_start.sh at line 24 [11.689]

B:BD[7.1376] → [2.339:388]

  "https://aftok.com/api/projects/$PID/logStart"

[7.1376]

  "https://$AFTOK_HOST/api/projects/$PID/logStart"

Update nginx.conf, make aftok host configurable for cli scripts.

Dependencies

In channels

Change contents

Replacement in deploy/nginx/nginx.conf at line 21 [4.200]

Replacement in deploy/nginx/nginx.conf at line 30 [4.200]

Insertion in deploy/nginx/nginx.conf at line 39 [4.200]

Replacement in deploy/nginx/nginx.conf at line 41 [4.200]

Insertion in deploy/nginx/nginx.conf at line 44 [4.200]

Replacement in deploy/nginx/nginx.conf at line 55 [4.200]

Replacement in deploy/nginx/nginx.conf at line 58 [4.200]

Insertion in docker-compose.yml at line 48 [3.23741]

Insertion in scripts/create_project.sh at line 5 [6.1241]

Replacement in scripts/create_project.sh at line 38 [6.1241]

Insertion in scripts/create_user.sh at line 2 [6.1424]

Replacement in scripts/create_user.sh at line 20 [6.1424]