From 3472c7bb7cd5423faa6da4ba73b844f9b5c6bf52 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Thu, 13 Aug 2020 21:41:56 +0200
Subject: [PATCH] Remove mirror_load_balancer stuff
This never really worked to well and since basically all PIA boxes that we
balanced to have died by now and it's also pretty slow.
---
playbooks/mirror.pkgbuild.com.yml | 15 --------
.../files/load-geoip.conf | 1 -
roles/mirror_load_balancer/tasks/main.yml | 26 --------------
.../templates/GeoIP.conf.j2 | 4 ---
.../templates/nginx.d.conf.j2 | 35 -------------------
5 files changed, 81 deletions(-)
delete mode 100644 playbooks/mirror.pkgbuild.com.yml
delete mode 100644 roles/mirror_load_balancer/files/load-geoip.conf
delete mode 100644 roles/mirror_load_balancer/tasks/main.yml
delete mode 100644 roles/mirror_load_balancer/templates/GeoIP.conf.j2
delete mode 100644 roles/mirror_load_balancer/templates/nginx.d.conf.j2
diff --git a/playbooks/mirror.pkgbuild.com.yml b/playbooks/mirror.pkgbuild.com.yml
deleted file mode 100644
index c8e622ed4..000000000
--- a/playbooks/mirror.pkgbuild.com.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-
-- name: setup mirror load balancer (using geoip)
- hosts: mirror.pkgbuild.com
- remote_user: root
- roles:
- - { role: common }
- - { role: firewalld }
- - { role: sshd }
- - { role: root_ssh }
- - { role: sudo }
- - { role: zabbix-agent, when: "'unmanaged' not in group_names" }
- - { role: certbot }
- - { role: nginx }
- - { role: mirror_load_balancer }
diff --git a/roles/mirror_load_balancer/files/load-geoip.conf b/roles/mirror_load_balancer/files/load-geoip.conf
deleted file mode 100644
index 09b290491..000000000
--- a/roles/mirror_load_balancer/files/load-geoip.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module /usr/lib/nginx/modules/ngx_http_geoip2_module.so;
diff --git a/roles/mirror_load_balancer/tasks/main.yml b/roles/mirror_load_balancer/tasks/main.yml
deleted file mode 100644
index c72b8d01f..000000000
--- a/roles/mirror_load_balancer/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-
-- name: install nginx-mod-geoip2
- pacman: name=nginx-mod-geoip2,geoipupdate state=present
-
-- name: install geoipupdate config
- template: src=GeoIP.conf.j2 dest=/etc/GeoIP.conf owner=root group=root mode=0644
- notify:
-
-- name: install mirror.pkgbuild.com.conf
- template: src=nginx.d.conf.j2 dest=/etc/nginx/nginx.d/mirror.pkgbuild.com.conf owner=root group=root mode=0644
- notify:
- - reload nginx
- tags: ['nginx']
-
-- name: install toplevel-snippet
- copy: src=load-geoip.conf dest=/etc/nginx/toplevel-snippets/load-geoip.conf owner=root group=root mode=0644
- notify:
- - reload nginx
- tags: ['nginx']
-
-- name: make nginx log dir
- file: path=/var/log/nginx/{{ mirror_domain }} state=directory owner=root group=root mode=0755
-
-- name: enable geoipupdate timer
- systemd: name=geoipupdate.timer enabled=yes state=started
diff --git a/roles/mirror_load_balancer/templates/GeoIP.conf.j2 b/roles/mirror_load_balancer/templates/GeoIP.conf.j2
deleted file mode 100644
index d07fbb2bb..000000000
--- a/roles/mirror_load_balancer/templates/GeoIP.conf.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-AccountID {{ vault_mirror_maxmind_id }}
-LicenseKey {{ vault_mirror_maxmind_license }}
-
-EditionIDs GeoLite2-City
diff --git a/roles/mirror_load_balancer/templates/nginx.d.conf.j2 b/roles/mirror_load_balancer/templates/nginx.d.conf.j2
deleted file mode 100644
index b66a486e1..000000000
--- a/roles/mirror_load_balancer/templates/nginx.d.conf.j2
+++ /dev/null
@@ -1,35 +0,0 @@
-geoip2 /var/lib/GeoIP/GeoLite2-City.mmdb {
- $geoip2_data_continent_name continent names en;
-}
-
-map $geoip2_data_continent_name $preferred_upstream {
- default ger.mirror.pkgbuild.com;
- 'Africa' ger.mirror.pkgbuild.com;
- 'Europe' ger.mirror.pkgbuild.com;
-}
-
-log_format loadbalancer
- '$host [$time_local] "$request" '
- '$status $body_bytes_sent "$http_referer" '
- '"$http_user_agent" dispatched to $scheme://$preferred_upstream$request_uri';
-
-server {
- listen 80;
- listen [::]:80;
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
- server_name {{ mirror_domain }};
-
- access_log /var/log/nginx/{{ mirror_domain }}/access.log loadbalancer;
- error_log /var/log/nginx/{{ mirror_domain }}/error.log;
-
- include snippets/letsencrypt.conf;
-
- ssl_certificate /etc/letsencrypt/live/{{ mirror_domain }}/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/{{ mirror_domain }}/privkey.pem;
- ssl_trusted_certificate /etc/letsencrypt/live/{{ mirror_domain }}/chain.pem;
-
- location / {
- return $scheme://$preferred_upstream$request_uri;
- }
-}
--
GitLab