From e8315633ff27d950715bfe7893410d3de5d6f9bf Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 23 Oct 2023 15:31:15 -0400 Subject: [PATCH] ansible/roles/xq-api: remove migrated to nomad --- ansible/build.yml | 1 - .../host_vars/a-hel-fi.m.voidlinux.org.yml | 9 --- ansible/roles/xq-api/defaults/main.yml | 3 - ansible/roles/xq-api/files/root.conf | 3 - ansible/roles/xq-api/handlers/main.yml | 10 --- ansible/roles/xq-api/meta/main.yml | 3 - ansible/roles/xq-api/tasks/main.yml | 76 ------------------- .../roles/xq-api/templates/xq-api-hup.sh.j2 | 2 - ansible/roles/xq-api/templates/xq-api.conf.j2 | 8 -- 9 files changed, 115 deletions(-) delete mode 100644 ansible/roles/xq-api/defaults/main.yml delete mode 100644 ansible/roles/xq-api/files/root.conf delete mode 100644 ansible/roles/xq-api/handlers/main.yml delete mode 100644 ansible/roles/xq-api/meta/main.yml delete mode 100644 ansible/roles/xq-api/tasks/main.yml delete mode 100644 ansible/roles/xq-api/templates/xq-api-hup.sh.j2 delete mode 100644 ansible/roles/xq-api/templates/xq-api.conf.j2 diff --git a/ansible/build.yml b/ansible/build.yml index ebd41522..1fb05677 100644 --- a/ansible/build.yml +++ b/ansible/build.yml @@ -6,7 +6,6 @@ roles: - acmetool - buildmaster - - xq-api - hosts: buildslave become: yes diff --git a/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml b/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml index e649baea..fb26a8f8 100644 --- a/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml +++ b/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml @@ -26,9 +26,6 @@ nginx_dhparam_bits: 2048 buildmaster_ssl_cert_path: /var/lib/acme/live/build.voidlinux.org/fullchain buildmaster_ssl_certkey_path: /var/lib/acme/live/build.voidlinux.org/privkey -xqapi_site_cert_path: /var/lib/acme/live/xq-api.voidlinux.org/fullchain -xqapi_site_key_path: /var/lib/acme/live/xq-api.voidlinux.org/privkey - man_cert_path: /var/lib/acme/live/man.voidlinux.org/fullchain man_key_path: /var/lib/acme/live/man.voidlinux.org/privkey @@ -46,16 +43,10 @@ acmetool: - site: build.voidlinux.org names: - build.voidlinux.org - - site: xq-api.voidlinux.org - names: - - xq-api.voidlinux.org hostmaster_email: postmaster@voidlinux.org services: - nginx -xqapi: - repodata: /mnt/data/pkgs/binpkgs - nomad_host_volumes: - name: terrastate path: /nomad/terrastate diff --git a/ansible/roles/xq-api/defaults/main.yml b/ansible/roles/xq-api/defaults/main.yml deleted file mode 100644 index 33ee4c74..00000000 --- a/ansible/roles/xq-api/defaults/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -xqapi: -xqapi_hup: diff --git a/ansible/roles/xq-api/files/root.conf b/ansible/roles/xq-api/files/root.conf deleted file mode 100644 index 3dc1f24b..00000000 --- a/ansible/roles/xq-api/files/root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - proxy_pass http://localhost:8197; -} diff --git a/ansible/roles/xq-api/handlers/main.yml b/ansible/roles/xq-api/handlers/main.yml deleted file mode 100644 index 2c53941e..00000000 --- a/ansible/roles/xq-api/handlers/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: xq-api - runit: - name: xq-api - state: restarted - -- name: xq-api-hup - runit: - name: xq-api-hup - state: restarted diff --git a/ansible/roles/xq-api/meta/main.yml b/ansible/roles/xq-api/meta/main.yml deleted file mode 100644 index e3d1763b..00000000 --- a/ansible/roles/xq-api/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: nginx } diff --git a/ansible/roles/xq-api/tasks/main.yml b/ansible/roles/xq-api/tasks/main.yml deleted file mode 100644 index 65dcd66f..00000000 --- a/ansible/roles/xq-api/tasks/main.yml +++ /dev/null @@ -1,76 +0,0 @@ ---- -- name: Install packages - xbps: - pkg: - - xq-api - - snooze - state: present - -- name: Configure xq-api - template: - src: xq-api.conf.j2 - dest: /etc/sv/xq-api/conf - owner: root - group: root - mode: 0644 - notify: - - xq-api - -- name: Install xq-api HUP service (1/2) - file: - path: /etc/sv/xq-api-hup - state: directory - owner: root - group: root - mode: 0755 - -- name: Install xq-api HUP service (2/2) - template: - src: xq-api-hup.sh.j2 - dest: /etc/sv/xq-api-hup/run - owner: root - group: root - mode: 0755 - notify: - - xq-api-hup - -- name: Create xq-api log directory - file: - path: /var/log/xq-api - state: directory - owner: _xqapi - group: _xqapi - mode: 0755 - -- name: Enable services - runit: - name: "{{ item }}" - enabled: yes - loop: - - xq-api - - xq-api-hup - -- name: Configure nginx base-site - include_role: - name: nginx - tasks_from: base-site - vars: - - site: - name: xq-api - urls: - - xq-api.voidlinux.org - static_root: no - tls: - certificate: "{{ xqapi_site_cert_path | default('/dev/null') }}" - key: "{{ xqapi_site_key_path | default('/dev/null') }}" - stapling: yes - -- name: Install location file - copy: - src: root.conf - dest: /etc/nginx/locations.d/xq-api.voidlinux.org/ - owner: root - group: root - mode: 0644 - notify: - - nginx diff --git a/ansible/roles/xq-api/templates/xq-api-hup.sh.j2 b/ansible/roles/xq-api/templates/xq-api-hup.sh.j2 deleted file mode 100644 index 7b626662..00000000 --- a/ansible/roles/xq-api/templates/xq-api-hup.sh.j2 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec snooze -H {{ xqapi_hup.hour | default('*') | quote }} -M {{ xqapi_hup.minute | default('/5') | quote }} /usr/bin/sv hup xq-api diff --git a/ansible/roles/xq-api/templates/xq-api.conf.j2 b/ansible/roles/xq-api/templates/xq-api.conf.j2 deleted file mode 100644 index 06e2ec2c..00000000 --- a/ansible/roles/xq-api/templates/xq-api.conf.j2 +++ /dev/null @@ -1,8 +0,0 @@ -NET={{ xqapi.listen_net | default('tcp') }} -ADDR={{ xqapi.listen_addr | default('127.0.0.1:8197') }} -MAX_QUERIES={{ xqapi.max_queries | default(16) }} -LOG_V={{ xqapi.log_v | default(None) }} -LOG_ACCESS={{ 't' if (xqapi.log_access | default(False)) else 'f' }} -LOG_TO_STDERR={{ 't' if (xqapi.log_to_stderr | default(False)) else 'f' }} -LOG_DIR={{ xqapi.log_dir | default(None) }} -REPODATA={{ xqapi.repodata | default('/var/db/xbps') }}