Skip to content

subql changes make module reusable and minor fixes #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 31, 2024
Merged

subql changes make module reusable and minor fixes #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
373d7f3
subql changes make module reusable
DaMandal0rian Oct 31, 2024
179598d
fixes to installers
DaMandal0rian Oct 31, 2024
f8e1d9e
fix hostname naming convention
DaMandal0rian Oct 31, 2024
4824f47
remove nginx, will use caddy from astral repo
DaMandal0rian Oct 31, 2024
8836e4d
temp disable subql launch script with terraform
DaMandal0rian Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions explorer/terraform/aws/taurus/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module "subql" {
instance-type = var.instance_type
deployment-version = 0
regions = var.aws_region
instance-count-blue = var.instance_count_blue
instance-count-blue = 0 #var.instance_count_blue
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type
environment = "production"
Expand All @@ -54,7 +54,7 @@ module "subql" {
instance-type = var.instance_type
deployment-version = 0
regions = var.aws_region
instance-count-green = var.instance_count_green
instance-count-green = 0 #var.instance_count_green
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type
environment = "staging"
Expand Down
71 changes: 6 additions & 65 deletions templates/terraform/subql/base/bootstrap_nova_subql_provisioner.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,6 @@ resource "null_resource" "setup-nova-blue-subql-nodes" {
destination = "/home/${var.ssh_user}/subql/install_docker.sh"
}

# copy nginx config files
provisioner "file" {
source = "${var.path_to_configs}/nginx-subql.conf"
destination = "/home/${var.ssh_user}/subql/backend.conf"
}

provisioner "file" {
source = "${var.path_to_configs}/cors-settings.conf"
destination = "/home/${var.ssh_user}/subql/cors-settings.conf"
}
# copy nginx install file
provisioner "file" {
source = "${var.path_to_scripts}/install_nginx.sh"
destination = "/home/${var.ssh_user}/subql/install_nginx.sh"
}

}

resource "null_resource" "setup-nova-green-subql-nodes" {
Expand Down Expand Up @@ -132,22 +116,6 @@ resource "null_resource" "setup-nova-green-subql-nodes" {
destination = "/home/${var.ssh_user}/subql/install_docker.sh"
}

# copy nginx config files
provisioner "file" {
source = "${var.path_to_configs}/nginx-subql.conf"
destination = "/home/${var.ssh_user}/subql/backend.conf"
}

provisioner "file" {
source = "${var.path_to_configs}/cors-settings.conf"
destination = "/home/${var.ssh_user}/subql/cors-settings.conf"
}
# copy nginx install file
provisioner "file" {
source = "${var.path_to_scripts}/install_nginx.sh"
destination = "/home/${var.ssh_user}/subql/install_nginx.sh"
}

}

resource "null_resource" "start-nova-blue-subql-nodes" {
Expand All @@ -174,25 +142,13 @@ resource "null_resource" "start-nova-blue-subql-nodes" {
# install deployments
provisioner "remote-exec" {
inline = [
# install nginx, certbot, docker and docker compose
# install docker and docker compose
"chmod +x /home/${var.ssh_user}/subql/install_docker.sh",
"sudo bash /home/${var.ssh_user}/subql/install_docker.sh",
# start docker daemon
"sudo systemctl enable --now docker.service",
"sudo systemctl restart docker.service",
# copy files
"sudo cp -f /home/${var.ssh_user}/subql/cors-settings.conf /etc/nginx/cors-settings.conf",
"sudo cp -f /home/${var.ssh_user}/subql/backend.conf /etc/nginx/backend.conf",
"chmod +x /home/${var.ssh_user}/subql/install_nginx.sh",
"sudo bash /home/${var.ssh_user}/subql/install_nginx.sh",
# start systemd services
"sudo systemctl daemon-reload",
# start nginx
"sudo systemctl enable nginx",
"sudo systemctl start nginx",
# install certbot & generate domain
"sudo certbot --nginx --non-interactive -v --agree-tos -m [email protected] -d ${var.blue-subql-node-config.domain-prefix}.${var.network_name}.subspace.network",
"sudo systemctl restart nginx",

# set hostname
"sudo hostnamectl set-hostname subql-${var.blue-subql-node-config.network-name}",

Expand Down Expand Up @@ -233,41 +189,26 @@ resource "null_resource" "nova-start-green-subql-nodes" {

}

# install nginx, certbot, docker and docker compose
# install docker and docker compose
provisioner "remote-exec" {
inline = [
"chmod +x /home/${var.ssh_user}/subql/install_docker.sh",
"sudo bash /home/${var.ssh_user}/subql/install_docker.sh",
# install nginx
"chmod +x /home/${var.ssh_user}/subql/install_nginx.sh",
"sudo bash /home/${var.ssh_user}/subql/install_nginx.sh",
]
}

# install deployments
provisioner "remote-exec" {
inline = [
# install nginx, certbot, docker and docker compose
# install docker and docker compose
"chmod +x /home/${var.ssh_user}/subql/install_docker.sh",
"sudo bash /home/${var.ssh_user}/subql/install_docker.sh",
# start docker daemon
"sudo systemctl enable --now docker.service",
"sudo systemctl restart docker.service",
# copy files
"sudo cp -f /home/${var.ssh_user}/subql/cors-settings.conf /etc/nginx/cors-settings.conf",
"sudo cp -f /home/${var.ssh_user}/subql/backend.conf /etc/nginx/backend.conf",
"chmod +x /home/${var.ssh_user}/subql/install_nginx.sh",
"sudo bash /home/${var.ssh_user}/subql/install_nginx.sh",
# start systemd services
"sudo systemctl daemon-reload",
# start nginx
"sudo systemctl enable nginx",
"sudo systemctl start nginx",
# install certbot & generate domain
"sudo certbot --nginx --non-interactive -v --agree-tos -m [email protected] -d subql.${var.network_name}.subspace.network -d ${var.blue-subql-node-config.domain-prefix}.subql.${var.network_name}.subspace.network",
"sudo systemctl restart nginx",

# set hostname
"sudo hostnamectl set-hostname subql-${var.blue-subql-node-config.network-name}",
"sudo hostnamectl set-hostname subql-${var.green-subql-node-config.deployment-color}-${var.green-subql-node-config.network-name}",

# create .env file
"echo NR_API_KEY=${var.nr_api_key} >> /home/${var.ssh_user}/subql/.env",
Expand Down
73 changes: 7 additions & 66 deletions templates/terraform/subql/base/bootstrap_subql_provisioner.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,6 @@ resource "null_resource" "setup-blue-subql-nodes" {
destination = "/home/${var.ssh_user}/subql/install_docker.sh"
}

# copy nginx config files
provisioner "file" {
source = "${var.path_to_configs}/nginx-subql.conf"
destination = "/home/${var.ssh_user}/subql/backend.conf"
}

provisioner "file" {
source = "${var.path_to_configs}/cors-settings.conf"
destination = "/home/${var.ssh_user}/subql/cors-settings.conf"
}
# copy nginx install file
provisioner "file" {
source = "${var.path_to_scripts}/install_nginx.sh"
destination = "/home/${var.ssh_user}/subql/install_nginx.sh"
}

}

resource "null_resource" "setup-green-subql-nodes" {
Expand Down Expand Up @@ -132,22 +116,6 @@ resource "null_resource" "setup-green-subql-nodes" {
destination = "/home/${var.ssh_user}/subql/install_docker.sh"
}

# copy nginx config files
provisioner "file" {
source = "${var.path_to_configs}/nginx-subql.conf"
destination = "/home/${var.ssh_user}/subql/backend.conf"
}

provisioner "file" {
source = "${var.path_to_configs}/cors-settings.conf"
destination = "/home/${var.ssh_user}/subql/cors-settings.conf"
}
# copy nginx install file
provisioner "file" {
source = "${var.path_to_scripts}/install_nginx.sh"
destination = "/home/${var.ssh_user}/subql/install_nginx.sh"
}

}

resource "null_resource" "start-blue-subql-nodes" {
Expand All @@ -174,27 +142,15 @@ resource "null_resource" "start-blue-subql-nodes" {
# install deployments
provisioner "remote-exec" {
inline = [
# install nginx, certbot, docker and docker compose
# install docker and docker compose
"chmod +x /home/${var.ssh_user}/subql/install_docker.sh",
"sudo bash /home/${var.ssh_user}/subql/install_docker.sh",
# start docker daemon
"sudo systemctl enable --now docker.service",
"sudo systemctl restart docker.service",
# copy files
"sudo cp -f /home/${var.ssh_user}/subql/cors-settings.conf /etc/nginx/cors-settings.conf",
"sudo cp -f /home/${var.ssh_user}/subql/backend.conf /etc/nginx/backend.conf",
"chmod +x /home/${var.ssh_user}/subql/install_nginx.sh",
"sudo bash /home/${var.ssh_user}/subql/install_nginx.sh",
# start systemd services
"sudo systemctl daemon-reload",
# start nginx
"sudo systemctl enable nginx",
"sudo systemctl start nginx",
# install certbot & generate domain
"sudo certbot --nginx --non-interactive -v --agree-tos -m [email protected] -d ${var.blue-subql-node-config.domain-prefix}.${var.network_name}.subspace.network",
"sudo systemctl restart nginx",

# set hostname
"sudo hostnamectl set-hostname subql-${var.blue-subql-node-config.network-name}",
"sudo hostnamectl set-hostname subql-${var.blue-subql-node-config.deployment-color}-${var.blue-subql-node-config.network-name}",

# create .env file
"echo NR_API_KEY=${var.nr_api_key} >> /home/${var.ssh_user}/subql/.env",
Expand Down Expand Up @@ -234,41 +190,26 @@ resource "null_resource" "start-green-subql-nodes" {

}

# install nginx, certbot, docker and docker compose
# install docker and docker compose
provisioner "remote-exec" {
inline = [
"chmod +x /home/${var.ssh_user}/subql/install_docker.sh",
"sudo bash /home/${var.ssh_user}/subql/install_docker.sh",
# install nginx
"chmod +x /home/${var.ssh_user}/subql/install_nginx.sh",
"sudo bash /home/${var.ssh_user}/subql/install_nginx.sh",
]
}

# install deployments
provisioner "remote-exec" {
inline = [
# install nginx, certbot, docker and docker compose
# install docker and docker compose
"chmod +x /home/${var.ssh_user}/subql/install_docker.sh",
"sudo bash /home/${var.ssh_user}/subql/install_docker.sh",
# start docker daemon
"sudo systemctl enable --now docker.service",
"sudo systemctl restart docker.service",
# copy files
"sudo cp -f /home/${var.ssh_user}/subql/cors-settings.conf /etc/nginx/cors-settings.conf",
"sudo cp -f /home/${var.ssh_user}/subql/backend.conf /etc/nginx/backend.conf",
"chmod +x /home/${var.ssh_user}/subql/install_nginx.sh",
"sudo bash /home/${var.ssh_user}/subql/install_nginx.sh",
# start systemd services
"sudo systemctl daemon-reload",
# start nginx
"sudo systemctl enable nginx",
"sudo systemctl start nginx",
# install certbot & generate domain
"sudo certbot --nginx --non-interactive -v --agree-tos -m [email protected] -d subql.${var.network_name}.subspace.network -d ${var.blue-subql-node-config.domain-prefix}.subql.${var.network_name}.subspace.network",
"sudo systemctl restart nginx",

# set hostname
"sudo hostnamectl set-hostname subql-${var.blue-subql-node-config.network-name}",
"sudo hostnamectl set-hostname subql-${var.green-subql-node-config.deployment-color}-${var.green-subql-node-config.network-name}",

# create .env file
"echo NR_API_KEY=${var.nr_api_key} >> /home/${var.ssh_user}/subql/.env",
Expand Down
41 changes: 0 additions & 41 deletions templates/terraform/subql/base/config/cors-settings.conf
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions templates/terraform/subql/base/config/nginx-subql.conf
View file
Open in desktop

This file was deleted.

Loading