diff --git a/lotus-land-story/caddy.yml b/lotus-land-story/caddy.yml index 8a322be..9d034cf 100644 --- a/lotus-land-story/caddy.yml +++ b/lotus-land-story/caddy.yml @@ -29,6 +29,7 @@ # restart: true name: caddy image: caddy:2 + restart: true ports: - "80:80" - "443:443" diff --git a/lotus-land-story/golink.yml b/lotus-land-story/golink.yml index 219eb7c..107c67b 100644 --- a/lotus-land-story/golink.yml +++ b/lotus-land-story/golink.yml @@ -23,10 +23,6 @@ volumes: - /mnt/lotus-land-story/golink:/home/nonroot restart_policy: unless-stopped - # networks: - # - name: lotus_land_story - # etc_hosts: - # host.docker.internal: host-gateway handlers: - name: Import restarts diff --git a/lotus-land-story/loki.yml b/lotus-land-story/loki.yml index d205bff..8489017 100644 --- a/lotus-land-story/loki.yml +++ b/lotus-land-story/loki.yml @@ -96,10 +96,9 @@ - name: Run Loki community.docker.docker_container: - # recreate: true - # restart: true name: loki image: grafana/loki:2.8.0 + restart: true command: -config.file=/mnt/config/loki.yml volumes: - /mnt/lotus-land-story/loki/config:/mnt/config @@ -112,10 +111,9 @@ - name: Run Promtail community.docker.docker_container: - # recreate: true - # restart: true name: promtail image: grafana/promtail:2.8.0 + restart: true command: -config.file=/mnt/config/promtail.yml volumes: - /var/log:/var/log diff --git a/lotus-land-story/templates/prometheus.yml b/lotus-land-story/templates/prometheus.yml index b7fb768..2831b53 100644 --- a/lotus-land-story/templates/prometheus.yml +++ b/lotus-land-story/templates/prometheus.yml @@ -1,8 +1,8 @@ global: # Attach these labels to any time series or alerts when communicating with # external systems (federation, remote storage, Alertmanager). - external_labels: - monitor: 'codelab-monitor' + # external_labels: + # monitor: 'codelab-monitor' scrape_configs: - job_name: prometheus diff --git a/main.tf b/main.tf index 88d7266..40bc8eb 100644 --- a/main.tf +++ b/main.tf @@ -19,15 +19,23 @@ variable "soa_email" { nullable = false } -data "linode_instances" "ramble-hard" { +data "linode_instances" "ramble_hard" { filter { name = "label" values = ["ramble-hard"] } } +data "linode_instances" "lotus_land_story" { + filter { + name = "label" + values = ["lotus-land-story"] + } +} + locals { - ramble-hard = data.linode_instances.ramble-hard.instances.0 + ramble_hard = data.linode_instances.ramble_hard.instances.0 + lotus_land_story = data.linode_instances.lotus_land_story.instances.0 } resource "linode_domain" "kejadlen-dev" {