From a5ef9dac70ce3286f2c84e04bf8677404fc96576 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 11 Feb 2024 17:09:10 -0800 Subject: [PATCH] Cleaning up more irrelevant files --- docker-host/roles/setup/templates/.gitkeep | 0 .../roles/setup/templates/prometheus.yml.j2 | 26 ------------------- .../roles/setup/templates/proxy.conf.j2 | 6 ----- .../setup/templates/vault-config.json.j2 | 15 ----------- docker-host/roles/setup/tests/test.yml | 2 +- docker-host/roles/setup/vars/main.yml | 2 +- docker-host/roles/setup/vars/private.yml | 4 --- 7 files changed, 2 insertions(+), 53 deletions(-) create mode 100644 docker-host/roles/setup/templates/.gitkeep delete mode 100644 docker-host/roles/setup/templates/prometheus.yml.j2 delete mode 100644 docker-host/roles/setup/templates/proxy.conf.j2 delete mode 100644 docker-host/roles/setup/templates/vault-config.json.j2 delete mode 100644 docker-host/roles/setup/vars/private.yml diff --git a/docker-host/roles/setup/templates/.gitkeep b/docker-host/roles/setup/templates/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/docker-host/roles/setup/templates/prometheus.yml.j2 b/docker-host/roles/setup/templates/prometheus.yml.j2 deleted file mode 100644 index 662fd4a..0000000 --- a/docker-host/roles/setup/templates/prometheus.yml.j2 +++ /dev/null @@ -1,26 +0,0 @@ -global: - scrape_interval: 15s - scrape_timeout: 10s - evaluation_interval: 15s -alerting: - alertmanagers: - - follow_redirects: true - enable_http2: true - scheme: http - timeout: 10s - api_version: v2 - static_configs: - - targets: [] -scrape_configs: -- job_name: prometheus-scraper - honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - follow_redirects: true - enable_http2: true - static_configs: - - targets: - - localhost:9090 - - "{{PRIVATE_IP}}":9100 diff --git a/docker-host/roles/setup/templates/proxy.conf.j2 b/docker-host/roles/setup/templates/proxy.conf.j2 deleted file mode 100644 index 5daae77..0000000 --- a/docker-host/roles/setup/templates/proxy.conf.j2 +++ /dev/null @@ -1,6 +0,0 @@ -server { - server_name {{SERVER_NAME}}; - location / { - proxy_pass http://127.0.0.1:{{PORT}}; - } -} \ No newline at end of file diff --git a/docker-host/roles/setup/templates/vault-config.json.j2 b/docker-host/roles/setup/templates/vault-config.json.j2 deleted file mode 100644 index 012fac6..0000000 --- a/docker-host/roles/setup/templates/vault-config.json.j2 +++ /dev/null @@ -1,15 +0,0 @@ -{ - "backend": { - "file": { - "path": "/vault/file" - } - }, - "listener": { - "tcp": { - "address": "0.0.0.0:{{VAULT_PORT}}", - "tls_disable": 1 - } - }, - "ui": true -} - diff --git a/docker-host/roles/setup/tests/test.yml b/docker-host/roles/setup/tests/test.yml index f96f82e..348e1b8 100644 --- a/docker-host/roles/setup/tests/test.yml +++ b/docker-host/roles/setup/tests/test.yml @@ -1,5 +1,5 @@ --- -- hosts: leftcoastlab +- hosts: lab tasks: - name: Normal Echo command: echo Quick test of an echo diff --git a/docker-host/roles/setup/vars/main.yml b/docker-host/roles/setup/vars/main.yml index 5129bde..0b885d2 100644 --- a/docker-host/roles/setup/vars/main.yml +++ b/docker-host/roles/setup/vars/main.yml @@ -1,6 +1,6 @@ --- # vars file for setup -DEBIAN_CODENAME: sid +UBUNTU_CODENAME: jammy GITEA_PUB_PORT: 3000 GITEA_SSH_PORT: 2222 FILEBROWSER_PORT: 8080 diff --git a/docker-host/roles/setup/vars/private.yml b/docker-host/roles/setup/vars/private.yml deleted file mode 100644 index b6412b8..0000000 --- a/docker-host/roles/setup/vars/private.yml +++ /dev/null @@ -1,4 +0,0 @@ -FILES_UID: 1004 -FILES_GID: 1004 -FILES_HOME: /home/files -PRIVATE_IP: 192.168.1.23 \ No newline at end of file