From 8c440b7917545e2be9e2f93d0ab390361edfc2ec Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Apr 23 2021 16:23:45 +0000 Subject: Merge branch 'remove_old_hosts' into 'production' Remove old machines (including their roles) that are deleted since a longer time now. See merge request infra/salt!491 --- diff --git a/pillar/id/aedir1_infra_opensuse_org.sls b/pillar/id/aedir1_infra_opensuse_org.sls deleted file mode 100644 index 79b86bd..0000000 --- a/pillar/id/aedir1_infra_opensuse_org.sls +++ /dev/null @@ -1,18 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - AE-DIR test provider (writeable) - - not salt-managed because FreeIPA client config must not be installed - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: AE-Dir master server / test provider - documentation: [] - responsible: - - mstroeder - partners: [] - weburls: - - https://aedir.infra.opensuse.org diff --git a/pillar/id/aedir2_infra_opensuse_org.sls b/pillar/id/aedir2_infra_opensuse_org.sls deleted file mode 100644 index 71f6961..0000000 --- a/pillar/id/aedir2_infra_opensuse_org.sls +++ /dev/null @@ -1,17 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - AE-DIR test consumer (read-only) - - not salt-managed because FreeIPA client config must not be installed - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: AE-Dir client / test consumer - documentation: [] - responsible: - - mstroeder - partners: [] - weburls: [] diff --git a/pillar/id/caasp-l1_infra_opensuse_org.sls b/pillar/id/caasp-l1_infra_opensuse_org.sls deleted file mode 100644 index 0008516..0000000 --- a/pillar/id/caasp-l1_infra_opensuse_org.sls +++ /dev/null @@ -1,20 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - Load balancing node of CaaSP cluster - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Load balancing node of CaaSP cluster - documentation: - - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#loadbalancer - responsible: - - kbabioch - - rklein - - fbergmann - - lcavajani - partners: [] - weburls: [] diff --git a/pillar/id/caasp-m1_infra_opensuse_org.sls b/pillar/id/caasp-m1_infra_opensuse_org.sls deleted file mode 100644 index 51e3cd3..0000000 --- a/pillar/id/caasp-m1_infra_opensuse_org.sls +++ /dev/null @@ -1,22 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - Master node of CaaSP cluster - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Master node of CaaSP cluster monitoring and controlling the cluster - documentation: - - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_master_nodes - responsible: - - kbabioch - - rklein - - fbergmann - - lcavajani - partners: - - caasp-m2.infra.opensuse.org - - caasp-m3.infra.opensuse.org - weburls: [] diff --git a/pillar/id/caasp-m2_infra_opensuse_org.sls b/pillar/id/caasp-m2_infra_opensuse_org.sls deleted file mode 100644 index 8f4457d..0000000 --- a/pillar/id/caasp-m2_infra_opensuse_org.sls +++ /dev/null @@ -1,22 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - Master node of CaaSP cluster - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Master node of CaaSP cluster monitoring and controlling the cluster - documentation: - - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_master_nodes - responsible: - - kbabioch - - rklein - - fbergmann - - lcavajani - partners: - - caasp-m1.infra.opensuse.org - - caasp-m3.infra.opensuse.org - weburls: [] diff --git a/pillar/id/caasp-m3_infra_opensuse_org.sls b/pillar/id/caasp-m3_infra_opensuse_org.sls deleted file mode 100644 index ad12f04..0000000 --- a/pillar/id/caasp-m3_infra_opensuse_org.sls +++ /dev/null @@ -1,22 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - Master node of CaaSP cluster - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Master node of CaaSP cluster monitoring and controlling the cluster - documentation: - - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_master_nodes - responsible: - - kbabioch - - rklein - - fbergmann - - lcavajani - partners: - - caasp-m1.infra.opensuse.org - - caasp-m2.infra.opensuse.org - weburls: [] diff --git a/pillar/id/caasp-w1_infra_opensuse_org.sls b/pillar/id/caasp-w1_infra_opensuse_org.sls deleted file mode 100644 index 4df774e..0000000 --- a/pillar/id/caasp-w1_infra_opensuse_org.sls +++ /dev/null @@ -1,22 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - Worker node of CaaSP cluster - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Worker node of CaaSP cluster running actual application containers - documentation: - - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_worker_nodes - responsible: - - kbabioch - - rklein - - fbergmann - - lcavajani - partners: - - caasp-w2.infra.opensuse.org - - caasp-w3.infra.opensuse.org - weburls: [] diff --git a/pillar/id/caasp-w2_infra_opensuse_org.sls b/pillar/id/caasp-w2_infra_opensuse_org.sls deleted file mode 100644 index a427627..0000000 --- a/pillar/id/caasp-w2_infra_opensuse_org.sls +++ /dev/null @@ -1,22 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - Worker node of CaaSP cluster - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Worker node of CaaSP cluster running actual application containers - documentation: - - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_worker_nodes - responsible: - - kbabioch - - rklein - - fbergmann - - lcavajani - partners: - - caasp-w1.infra.opensuse.org - - caasp-w3.infra.opensuse.org - weburls: [] diff --git a/pillar/id/caasp-w3_infra_opensuse_org.sls b/pillar/id/caasp-w3_infra_opensuse_org.sls deleted file mode 100644 index 6776c43..0000000 --- a/pillar/id/caasp-w3_infra_opensuse_org.sls +++ /dev/null @@ -1,22 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - Worker node of CaaSP cluster - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Worker node of CaaSP cluster running actual application containers - documentation: - - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_worker_nodes - responsible: - - kbabioch - - rklein - - fbergmann - - lcavajani - partners: - - caasp-w1.infra.opensuse.org - - caasp-w2.infra.opensuse.org - weburls: [] diff --git a/pillar/id/forumsoo_temp_infra_opensuse_org.sls b/pillar/id/forumsoo_temp_infra_opensuse_org.sls deleted file mode 100644 index ba8ddcc..0000000 --- a/pillar/id/forumsoo_temp_infra_opensuse_org.sls +++ /dev/null @@ -1,18 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - temp forums database - roles: - - mysql_tmp - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Temporary mysql database for forums migration - documentation: [] - responsible: - - cboltz - partners: [] - weburls: [] diff --git a/pillar/id/keyserver1_infra_opensuse_org.sls b/pillar/id/keyserver1_infra_opensuse_org.sls deleted file mode 100644 index 082b0e7..0000000 --- a/pillar/id/keyserver1_infra_opensuse_org.sls +++ /dev/null @@ -1,21 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - keyserver1.o.o - roles: - - web_keyserver - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: GPG Keyserver (shut down) - documentation: - - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/Keyserverinfraopensuseorg - responsible: [] - partners: - - keyserver2.infra.opensuse.org - weburls: - - https://keyserver.opensuse.org - - https://keyserver1.opensuse.org diff --git a/pillar/id/keyserver2_infra_opensuse_org.sls b/pillar/id/keyserver2_infra_opensuse_org.sls deleted file mode 100644 index 2bf73fd..0000000 --- a/pillar/id/keyserver2_infra_opensuse_org.sls +++ /dev/null @@ -1,20 +0,0 @@ -grains: - city: provo - country: us - hostusage: - - keyserver2.o.o - roles: - - web_keyserver - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: bryce - - aliases: [] - description: GPG Keyserver (shut down) - documentation: - - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/Keyserverinfraopensuseorg - responsible: [] - partners: - - keyserver1.infra.opensuse.org - weburls: - - https://keyserver2.opensuse.org diff --git a/pillar/id/rafiki_infra_opensuse_org.sls b/pillar/id/rafiki_infra_opensuse_org.sls deleted file mode 100644 index 2778baf..0000000 --- a/pillar/id/rafiki_infra_opensuse_org.sls +++ /dev/null @@ -1,17 +0,0 @@ -grains: - city: provo - country: us - hostusage: - - future login3.o.o (provo login proxy) - roles: - - login - reboot_safe: unknown - salt_cluster: opensuse - virt_cluster: bryce - - aliases: [] - description: future provo login proxy - documentation: [] - responsible: [] - partners: [] - weburls: [] diff --git a/pillar/id/svn2_opensuse_org.sls b/pillar/id/svn2_opensuse_org.sls deleted file mode 100644 index 4c34159..0000000 --- a/pillar/id/svn2_opensuse_org.sls +++ /dev/null @@ -1,17 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - svn_git - roles: [] - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Old (kernel) git and svn server. To be decommisioned. - documentation: [] - responsible: - - jdsn - partners: [] - weburls: [] diff --git a/pillar/role/mysql_tmp.sls b/pillar/role/mysql_tmp.sls deleted file mode 100644 index 96400f0..0000000 --- a/pillar/role/mysql_tmp.sls +++ /dev/null @@ -1,25 +0,0 @@ -{% if salt['grains.get']('include_secrets', True) %} -include: - - secrets.role.mysql_tmp -{% endif %} - -mysql: - server: - mysqld: - # bigger packet size needed for importing SQL dumps - max_allowed_packet: 64M - # root_password included from pillar/secrets/role/mysql_tmp.sls - lookup: - python: python3-PyMySQL - - # database and user for forums migration - database: - - forums - user: - forums: - # password included from pillar/secrets/role/mysql_tmp.sls - host: '%' - databases: - - database: forums - grants: ['all privileges'] - diff --git a/pillar/role/web_keyserver.sls b/pillar/role/web_keyserver.sls deleted file mode 100644 index d0e6600..0000000 --- a/pillar/role/web_keyserver.sls +++ /dev/null @@ -1,74 +0,0 @@ -{% set host = salt['grains.get']('host') %} -{% set ip4_private = salt['grains.get']('ipv4_interfaces:private[0]') %} - -include: - - role.common.nginx - -nginx: - ng: - server: - config: - http: - client_max_body_size: 8m - gzip_static: 'on' - gzip_min_length: 1000 - gzip_proxied: - - expired - - no-cache - - no-store - - private - - auth - gzip_types: - - text/plain - - text/css - - application/xml - - application/x-javascript - worker_processes: 4 - servers: - managed: - keyserver.opensuse.org.conf: - config: - - server: - - listen: - - 80 - - default_server - - listen: - - {{ ip4_private }}:11371 - - default_server - - server_name: keyserver.opensuse.org - - server_name: {{ host }}.opensuse.org - - server_name: '*.sks-keyservers.net' - - server_name: '*.pool.sks-keyservers.net' - - server_name: pgp.mit.edu - - server_name: keys.gnupg.net - - root: /srv/www/htdocs - - rewrite: ^/stats /pks/lookup?op=stats - - rewrite: ^/s/(.*) /pks/lookup?search=$1 - - rewrite: ^/search/(.*) /pks/lookup?search=$1 - - rewrite: ^/g/(.*) /pks/lookup?op=get&search=$1 - - rewrite: ^/get/(.*) /pks/lookup?op=get&search=$1 - - rewrite: ^/hashquery /pks/hashquery - - rewrite: ^/hashquery/(.*) /pks/hashquery/$1 - - rewrite: ^/d/(.*) /pks/lookup?op=get&options=mr&search=$1 - - rewrite: ^/download/(.*) /pks/lookup?op=get&options=mr&search=$1 - - expires: 1y - - add_header: Pragma public - - add_header: Cache-Control "public" - - location /check.txt: - - root: /srv/www/htdocs - - access_log: 'off' - - location /: - - root: /srv/www/htdocs - - index: - - index.html - - index.htm - - location /pks: - - proxy_pass: http://127.0.0.1:11371 - - proxy_pass_header: Server - - add_header: Via "1.1 {{ host }}.opensuse.org:11371" - - proxy_ignore_client_abort: 'on' - - client_max_body_size: 8m - - error_page: 500 502 503 504 /50x.html - - location = /50x.html: - - root: /srv/www/htdocs - enabled: True diff --git a/salt/role/mysql_tmp.sls b/salt/role/mysql_tmp.sls deleted file mode 100644 index 311a57f..0000000 --- a/salt/role/mysql_tmp.sls +++ /dev/null @@ -1,3 +0,0 @@ -include: - - mysql - - mysql.remove_test_database diff --git a/salt/role/web_keyserver.sls b/salt/role/web_keyserver.sls deleted file mode 100644 index a5b1924..0000000 --- a/salt/role/web_keyserver.sls +++ /dev/null @@ -1,2 +0,0 @@ -include: - - profile.web.server.nginx