Browse Source

fixing bugs and issues while testing

master
forest 2 years ago
parent
commit
b65f215458
  1. 3
      ansible-roles/threshold-server-config/tasks/main.yml
  2. 1
      build.sh
  3. 3
      main.go
  4. 1
      terraform-modules/gateway-instance-digitalocean/main.tf

3
ansible-roles/threshold-server-config/tasks/main.yml

@ -14,8 +14,7 @@
replace: '-mode server'
- name: set cap_net_bind_service=+ep on threshold (allow threshold to listen on all ports)
script:
cmd: setcap cap_net_bind_service=+ep /opt/threshold/threshold
shell: setcap cap_net_bind_service=+ep /opt/threshold/threshold
- name: install threshold server TLS certificate
copy:

1
build.sh

@ -15,6 +15,7 @@ cp ansible-wrapper/ansible.cfg build/servergarden-rootsystem/ansible-wrapper/ans
cp -r terraform-modules build/servergarden-rootsystem/terraform-modules
cp -r ansible-roles build/servergarden-rootsystem/ansible-roles
cp -r application-modules build/servergarden-rootsystem/application-modules
#remove symlinks/log files that rootsystem adds at runtime.
rm -f build/servergarden-rootsystem/terraform-modules/*/roles

3
main.go

@ -80,7 +80,7 @@ func main() {
Err: errors.Wrap(err, "can't create certs for threshold"),
}
}
return automation.TaskResult{Name: "knownHostsCredentials"}
return automation.TaskResult{Name: "buildTLSCertsForThreshold"}
},
func() automation.TaskResult {
@ -221,6 +221,7 @@ func main() {
} else {
os.MkdirAll("/var/run/servergarden/threshold/", 0o700)
os.MkdirAll("/var/run/servergarden/caddy/", 0o700)
os.MkdirAll("/var/lib/servergarden/caddy/data/", 0o700)
svg, statusChannel, err := automation.DockerComposeUp(config, workingDirectory)
if err != nil {

1
terraform-modules/gateway-instance-digitalocean/main.tf

@ -33,6 +33,7 @@ resource "digitalocean_droplet" "gateway" {
name = var.domain_name
region = var.digitalocean_region
size = "s-1vcpu-1gb"
private_networking = true
ssh_keys = var.digitalocean_ssh_key_fingerprints
tags = ["autoservergarden", "autoservergarden-gateway"]
user_data = data.template_file.user_data.rendered

Loading…
Cancel
Save