Skip to content

Commit f82ac50

Browse files
committed
New deployment setup (2)
1 parent cc883be commit f82ac50

File tree

12 files changed

+12
-7
lines changed

12 files changed

+12
-7
lines changed

.github/workflows/build-and-trigger-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/download-artifact@v1.0.0
3737
with: { name: version }
3838
- name: Build cloud images
39-
run: packer build -var "version=$(cat version/version)" -var "digitalocean_token=${{ secrets.DIGITALOCEAN_TOKEN }}" deploy/cloud-images.json
39+
run: packer build -var "version=$(cat version/version)" -var "digitalocean_token=${{ secrets.DIGITALOCEAN_TOKEN }}" deployments/cloud-images.json
4040

4141
docker-image-amd64:
4242
runs-on: ubuntu-latest
File renamed without changes.

deploy/modules/backend/app.nginx.conf renamed to deployments/modules/backend/app.nginx.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ upstream web.luajit.me {
1010

1111
upstream compute.luajit.me {
1212
least_conn;
13-
# <COMPUTE_IPV4_ADDRESS>
13+
# <COMPUTE_AMD64_IPV4_ADDRESS>
14+
server 127.0.0.1 down; # workaround for "no servers configured"
1415
}
1516

1617
proxy_cache_path /data/nginx/cache levels=1 keys_zone=luajit.me:1m;

deploy/modules/backend/main.tf renamed to deployments/modules/backend/main.tf

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ resource "digitalocean_droplet" "web" {
3434
"mkdir -p /data/nginx/cache",
3535
"chown www-data: /data/nginx/cache",
3636
"sed '-es/<SELF_IPV4_ADDRESS>/${self.ipv4_address_private}/' /root/app.nginx.conf > /etc/nginx/sites-available/luajit.me",
37-
"for IPV4_ADDRESS in ${join(" ", values(digitalocean_droplet.compute_amd64).*.ipv4_address_private)}; do sed -i /etc/nginx/sites-available/luajit.me -e \"/COMPUTE_IPV4_ADDRESS/a\\ \\ server $${IPV4_ADDRESS}:80;\"; done",
3837
"ln -s /etc/nginx/sites-available/luajit.me /etc/nginx/sites-enabled/luajit.me",
3938
"rm /etc/nginx/sites-enabled/default",
4039
"systemctl enable nginx",
@@ -71,7 +70,7 @@ resource "digitalocean_droplet" "compute_amd64" {
7170
}
7271
}
7372

74-
resource "null_resource" "update_compute_cluster_user" {
73+
resource "null_resource" "configure_compute_cluster_user" {
7574
count = length(digitalocean_droplet.web)
7675
triggers = {
7776
compute_cluster_amd64_ips = join(" ", values(digitalocean_droplet.compute_amd64).*.ipv4_address_private)
@@ -84,9 +83,14 @@ resource "null_resource" "update_compute_cluster_user" {
8483
}
8584
provisioner "remote-exec" {
8685
inline = [
87-
"sed -e '/COMPUTE_IPV4_ADDRESS/,/}/{/server/d}' -i /etc/nginx/sites-available/luajit.me",
88-
"for IPV4_ADDRESS in ${join(" ", values(digitalocean_droplet.compute_amd64).*.ipv4_address_private)}; do sed -i /etc/nginx/sites-available/luajit.me -e \"/COMPUTE_IPV4_ADDRESS/a\\ \\ server $${IPV4_ADDRESS}:80;\"; done",
89-
"service nginx reload"
86+
<<EOT
87+
(echo '/COMPUTE_AMD64_IPV4_ADDRESS/,/}/{/server/d};/COMPUTE_AMD64_IPV4_ADDRESS/{';
88+
%{ for ip in values(digitalocean_droplet.compute_amd64).*.ipv4_address_private }
89+
echo 'a\ \ server ${ip}:80;';
90+
%{ endfor }
91+
echo '}' ) | sed -f /dev/stdin -i /etc/nginx/sites-available/luajit.me
92+
EOT
93+
, "service nginx reload"
9094
]
9195
}
9296
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)