From 851c6b167c38f9cae87dbe90b79154462f2c1f3e Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 14 May 2020 13:54:59 +0100 Subject: [PATCH] Remove yourls Mariadb update broke it, but I never use it anyway. --- .../files/yourls/docker-compose.yml | 32 --------------- .../intersect-docker/files/yourls/index.html | 8 ---- ansible/roles/intersect-docker/tasks/main.yml | 3 -- .../roles/intersect-docker/tasks/yourls.yml | 40 ------------------- .../roles/intersect-docker/vars/yourls.yml | 12 ------ terraform/0rng.one.tf | 8 ---- 6 files changed, 103 deletions(-) delete mode 100644 ansible/roles/intersect-docker/files/yourls/docker-compose.yml delete mode 100644 ansible/roles/intersect-docker/files/yourls/index.html delete mode 100644 ansible/roles/intersect-docker/tasks/yourls.yml delete mode 100644 ansible/roles/intersect-docker/vars/yourls.yml diff --git a/ansible/roles/intersect-docker/files/yourls/docker-compose.yml b/ansible/roles/intersect-docker/files/yourls/docker-compose.yml deleted file mode 100644 index f20fe81..0000000 --- a/ansible/roles/intersect-docker/files/yourls/docker-compose.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: "2.3" - -services: - yourls: - image: yourls:1.7.9-apache - container_name: yourls - restart: unless-stopped - depends_on: - - mysql - environment: - - YOURLS_DB_PASS=yourls - - YOURLS_DB_USER=yourls - - YOURLS_USER=jake - - YOURLS_PASS={{ yourls.user_password }} - - YOURLS_SITE=https://0rng.one - volumes: - - ./index.html:/var/www/html/index.html - labels: - - "traefik.enable=true" - - "traefik.http.routers.yourls.rule=Host(`0rng.one`)" - - "traefik.http.routers.yourls.tls.certresolver=le" - - mysql: - image: mariadb:10.4 - environment: - - MYSQL_ROOT_PASSWORD=root - - MYSQL_DATABASE=yourls - - MYSQL_USER=yourls - - MYSQL_PASSWORD=yourls - volumes: - - ./mariadb:/config - restart: unless-stopped diff --git a/ansible/roles/intersect-docker/files/yourls/index.html b/ansible/roles/intersect-docker/files/yourls/index.html deleted file mode 100644 index 8e8085b..0000000 --- a/ansible/roles/intersect-docker/files/yourls/index.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -

Redirecting to website...

- - diff --git a/ansible/roles/intersect-docker/tasks/main.yml b/ansible/roles/intersect-docker/tasks/main.yml index 8282bb9..5916393 100644 --- a/ansible/roles/intersect-docker/tasks/main.yml +++ b/ansible/roles/intersect-docker/tasks/main.yml @@ -45,6 +45,3 @@ - name: Install whoami include: whoami.yml - -- name: Install yourls - include: yourls.yml diff --git a/ansible/roles/intersect-docker/tasks/yourls.yml b/ansible/roles/intersect-docker/tasks/yourls.yml deleted file mode 100644 index d013845..0000000 --- a/ansible/roles/intersect-docker/tasks/yourls.yml +++ /dev/null @@ -1,40 +0,0 @@ -- name: Include yourls variables - include_vars: yourls.yml - -- name: Create yourls directory - file: - path: /opt/yourls - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install yourls compose file - template: - src: files/yourls/docker-compose.yml - dest: /opt/yourls/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: Install yourls index - template: - src: files/yourls/index.html - dest: /opt/yourls/index.html - mode: "{{ docker_compose_file_mask }}" - register: config_file - become: true - -- name: Cycle yourls container - docker_compose: - project_src: /opt/yourls - pull: true - remove_orphans: true - remove_volumes: true - state: "{{ item }}" - when: compose_file.changed or config_file.changed - loop: - - absent - - present diff --git a/ansible/roles/intersect-docker/vars/yourls.yml b/ansible/roles/intersect-docker/vars/yourls.yml deleted file mode 100644 index fc70dd6..0000000 --- a/ansible/roles/intersect-docker/vars/yourls.yml +++ /dev/null @@ -1,12 +0,0 @@ -yourls: - user_password: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 66613263376130663031363539633863343432323330396135633639613138343139333930643030 - 3131316364323235623237373435356635333230336463660a626266396133383261353264333536 - 32356634396631323961366537393063373032373538373733663564336163376634363766613337 - 6431373166323137300a643766303932353434393266393566663738633864313934623466613235 - 33653439313766633334393433376430393138636564383861306631353633653365366432616338 - 31626535646630376666386437393633336530343265656464653164356463346135383562363965 - 34303039363662643261306139373139646264613630623362613438333466356434636166636162 - 33636662353336373838336437346233343338383731316538323366653261363265643239653536 - 36326461396235353533653136626361363631363539363830623663386435313332 diff --git a/terraform/0rng.one.tf b/terraform/0rng.one.tf index 57bd209..89b8ecd 100644 --- a/terraform/0rng.one.tf +++ b/terraform/0rng.one.tf @@ -10,14 +10,6 @@ resource "cloudflare_record" "orngone_git" { ttl = 1 } -resource "cloudflare_record" "orngone_yourls" { - zone_id = cloudflare_zone.orngone.id - name = "@" - value = vultr_server.casey.main_ip - type = "A" - ttl = 1 -} - resource "cloudflare_record" "orngone_who" { zone_id = cloudflare_zone.orngone.id name = "who"