From 54967444285472fe6d483cdd09a7dcdf4bcd3517 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 9 Oct 2020 23:11:53 +0100 Subject: [PATCH] Remove web-rng --- .../files/web-rng/docker-compose.yml | 10 -------- ansible/roles/intersect_docker/tasks/main.yml | 3 --- .../roles/intersect_docker/tasks/web-rng.yml | 23 ------------------- terraform/theorangeone.net.tf | 8 ------- 4 files changed, 44 deletions(-) delete mode 100644 ansible/roles/intersect_docker/files/web-rng/docker-compose.yml delete mode 100644 ansible/roles/intersect_docker/tasks/web-rng.yml diff --git a/ansible/roles/intersect_docker/files/web-rng/docker-compose.yml b/ansible/roles/intersect_docker/files/web-rng/docker-compose.yml deleted file mode 100644 index 0f3fe80..0000000 --- a/ansible/roles/intersect_docker/files/web-rng/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: "2.3" - -services: - web-rng: - image: docker.pkg.github.com/realorangeone/web-rng/web-rng:latest - restart: unless-stopped - labels: - - traefik.enable=true - - traefik.http.routers.web-rng.rule=Host(`rng.theorangeone.net`) - - traefik.http.routers.web-rng.tls.certresolver=le diff --git a/ansible/roles/intersect_docker/tasks/main.yml b/ansible/roles/intersect_docker/tasks/main.yml index b9a51b4..ec18816 100644 --- a/ansible/roles/intersect_docker/tasks/main.yml +++ b/ansible/roles/intersect_docker/tasks/main.yml @@ -25,8 +25,5 @@ - name: Install wallabag include: wallabag.yml -- name: Install web-rng - include: web-rng.yml - - name: Install whoami include: whoami.yml diff --git a/ansible/roles/intersect_docker/tasks/web-rng.yml b/ansible/roles/intersect_docker/tasks/web-rng.yml deleted file mode 100644 index fd0dfae..0000000 --- a/ansible/roles/intersect_docker/tasks/web-rng.yml +++ /dev/null @@ -1,23 +0,0 @@ -- name: Create web-rng directory - file: - path: /opt/web-rng - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install web-rng compose file - template: - src: files/web-rng/docker-compose.yml - dest: /opt/web-rng/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config - register: compose_file - become: true - -- name: restart web-rng - shell: - chdir: /opt/web-rng - cmd: "{{ docker_update_command }}" - when: compose_file.changed diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf index a7bc2f8..58da28e 100644 --- a/terraform/theorangeone.net.tf +++ b/terraform/theorangeone.net.tf @@ -133,14 +133,6 @@ resource "cloudflare_record" "theorangeonenet_upload" { ttl = 1 } -resource "cloudflare_record" "theorangeonenet_rng" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "rng" - value = vultr_server.casey.main_ip - type = "A" - ttl = 1 -} - resource "cloudflare_record" "theorangeonenet_plausible" { zone_id = cloudflare_zone.theorangeonenet.id name = "plausible"