From ea38207632f761fea283a302ff8dad56e616e0f7 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 15 Mar 2021 11:09:42 +0200 Subject: drop useless junk --- demo-workers.hz | 8 ------ demo.hz | 7 ----- effi.hz | 5 ---- effi.yml | 72 --------------------------------------------------- hosts.ci-prep | 0 hosts.ci-prod | 1 - hosts.ci-prod-workers | 2 -- hosts.demo | 0 hosts.demo-workers | 0 hosts.effi | 0 hosts.ick | 0 hosts.ickdev | 1 - hosts.icktest | 0 hosts.muck | 0 hosts.primus | 0 hosts.primus-workers | 0 hosts.wmf | 0 hosts.wmf2 | 0 ick-api.yml | 42 ------------------------------ ick-ui.yml | 37 -------------------------- ick.hz | 5 ---- ick2.yml | 23 ---------------- ickdev.hz | 7 ----- icktest.hz | 8 ------ ickweb.hz | 5 ---- ickweb.yml | 18 ------------- muck.hz | 5 ---- primus-workers.hz | 12 --------- primus.hz | 6 ----- web.yml | 72 --------------------------------------------------- 30 files changed, 336 deletions(-) delete mode 100644 demo-workers.hz delete mode 100644 demo.hz delete mode 100644 effi.hz delete mode 100644 effi.yml delete mode 100644 hosts.ci-prep delete mode 100644 hosts.ci-prod delete mode 100644 hosts.ci-prod-workers delete mode 100644 hosts.demo delete mode 100644 hosts.demo-workers delete mode 100644 hosts.effi delete mode 100644 hosts.ick delete mode 100644 hosts.ickdev delete mode 100644 hosts.icktest delete mode 100644 hosts.muck delete mode 100644 hosts.primus delete mode 100644 hosts.primus-workers delete mode 100644 hosts.wmf delete mode 100644 hosts.wmf2 delete mode 100644 ick-api.yml delete mode 100644 ick-ui.yml delete mode 100644 ick.hz delete mode 100644 ick2.yml delete mode 100644 ickdev.hz delete mode 100644 icktest.hz delete mode 100644 ickweb.hz delete mode 100644 ickweb.yml delete mode 100644 muck.hz delete mode 100644 primus-workers.hz delete mode 100644 primus.hz delete mode 100644 web.yml diff --git a/demo-workers.hz b/demo-workers.hz deleted file mode 100644 index f5aa0c1..0000000 --- a/demo-workers.hz +++ /dev/null @@ -1,8 +0,0 @@ -defaults: - type: cx11 - image: debian-9 -hosts: - - name: worker1 - groups: [workers, ickhost] - - name: worker2 - groups: [workers, ickhost] diff --git a/demo.hz b/demo.hz deleted file mode 100644 index 717f548..0000000 --- a/demo.hz +++ /dev/null @@ -1,7 +0,0 @@ -defaults: - type: cx11 - image: debian-9 -hosts: - - name: controller - type: cx21 - groups: [ickhost] diff --git a/effi.hz b/effi.hz deleted file mode 100644 index 6146f71..0000000 --- a/effi.hz +++ /dev/null @@ -1,5 +0,0 @@ -defaults: - type: cx11 - image: debian-9 -hosts: - - name: reg diff --git a/effi.yml b/effi.yml deleted file mode 100644 index 8945f1d..0000000 --- a/effi.yml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: reg - remote_user: root - become: yes - roles: - - role: sane_debian_system - - role: comfortable - - role: unix_users - - role: haproxy - - role: qvisqve - - role: muck - tags: muck - - role: effi-reg - tags: effi-reg - vars: - hostname: effidemo - - debian_codename: stretch - - sources_lists: - - repo: "deb http://ci-prod-controller.vm.liw.fi/debian stretch-ci main ickhost" - signing_key: "{{ ci_prod_apt_signing_key }}" - - unix_users: - - username: root - authorized_keys: | - {{ liw_ssh_key_pub }} - {{ wm_ssh_key_pub }} - - letsencrypt_email: liw@liw.fi - haproxy_domain: "{{ reg_domain }}" - haproxy_rules: - - name: qvisqve1 - path: /token - backends: ["127.0.0.1:{{ qvisqve_port }}"] - - - name: qvisqve2 - path: /clients - backends: ["127.0.0.1:{{ qvisqve_port }}"] - - - name: qvisqve3 - path: /auth - backends: ["127.0.0.1:{{ qvisqve_port }}"] - - - name: effiapi1 - path: /status - backends: ["127.0.0.1:{{ effiapi_port }}"] - - - name: effiapi2 - path: /memb - backends: ["127.0.0.1:{{ effiapi_port }}"] - - - name: effiapi3 - path: /search - backends: ["127.0.0.1:{{ effiapi_port }}"] - - - name: effireg1 - path: / - backends: ["127.0.0.1:{{ effireg_port }}"] - - - name: effireg2 - path: /callback - backends: ["127.0.0.1:{{ effireg_port }}"] - - muck_port: 12765 - effiapi_port: 8080 - effireg_port: 8181 - - qvisqve_port: 10000 - qvisqve_domain: "{{ reg_domain }}" - - wm_ssh_key_pub: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvVYqyPen0CFhfx9dzzCKNbQ7fUpbCRdlQ/PI4sAv5R+gjUYjZJ3HQQhdkEx6mwY+fGYgGIAY9xiTi+BzXSPPtuWUypB2/ee+Dh5Uqica1TCj/3txmFGE7qwD+AqoJYbDAD1x17AaCIEDgHv2wOQ2o8GlOKTK9mGgvZWTUgIUF7PObotg8/M6TV4NO3of7ZSJ0yqumU/GLaJ8UkvYVQ3Gj0w8tbX6xiJKcOnMyM+P+JIFRKKi/SzjymVfAie9OAlIcDEYTeT6dtqWYB6hT0/40D0ZcxOfIg07/m4A956hH9AzRKuz01w2phP2zQyHRUSOCWa5EWF/H9snxpeE5Ein liw@exolobe3 diff --git a/hosts.ci-prep b/hosts.ci-prep deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.ci-prod b/hosts.ci-prod deleted file mode 100644 index c8c8c4b..0000000 --- a/hosts.ci-prod +++ /dev/null @@ -1 +0,0 @@ -controller ansible_ssh_host=ci-prod-controller.vm.liw.fi diff --git a/hosts.ci-prod-workers b/hosts.ci-prod-workers deleted file mode 100644 index ae6f020..0000000 --- a/hosts.ci-prod-workers +++ /dev/null @@ -1,2 +0,0 @@ -worker1 ansible_ssh_host=ci-prod-workers-worker1.vm.liw.fi -worker2 ansible_ssh_host=ci-prod-workers-worker2.vm.liw.fi diff --git a/hosts.demo b/hosts.demo deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.demo-workers b/hosts.demo-workers deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.effi b/hosts.effi deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.ick b/hosts.ick deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.ickdev b/hosts.ickdev deleted file mode 100644 index 642cded..0000000 --- a/hosts.ickdev +++ /dev/null @@ -1 +0,0 @@ -api ansible_ssh_host=ickdev-api.vm.liw.fi diff --git a/hosts.icktest b/hosts.icktest deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.muck b/hosts.muck deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.primus b/hosts.primus deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.primus-workers b/hosts.primus-workers deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.wmf b/hosts.wmf deleted file mode 100644 index e69de29..0000000 diff --git a/hosts.wmf2 b/hosts.wmf2 deleted file mode 100644 index e69de29..0000000 diff --git a/ick-api.yml b/ick-api.yml deleted file mode 100644 index e22403c..0000000 --- a/ick-api.yml +++ /dev/null @@ -1,42 +0,0 @@ -- hosts: api - remote_user: root - become: yes - roles: - - sane_debian_system - - unix_users - - comfortable - vars: - hostname: api - qvisqve_domain: "{{ controller_domain }}" - artifact_store_domain: "{{ controller_domain }}" - apt_domain: "{{ controller_domain }}" - notify_domain: "{{ controller_domain }}" - - liw_ssh_key_pub: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50 - - ivan_ssh_key_pub: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDEeGFCBvqrYfNiQMpNnC8R7l9IfOhwLWhfu/MxSf7k0xa39hlnz4G/2A2br4TFP/RQPP+5zVtEiDrlf0Zwv5Z32/D5hFLd18qixmFyhTNBnLpO3Hlf+qGgfgM7IuTh49gs8fhGYuYem8qH247/ez5HNpKmBiJ+leaNUS06RTCF3J1JdKSb/wtxK1VFxaoxXfhlxVgjETSALWC39YvTZhtiZ8sVOF60opUQUYcEwW5sehB0Bhj3uiCOY4bfdNvmrWXmirS1SIw+b+RUu9mcit8haJM3U6SXlyPc62OJq3boyVn+ZtVhwlMmNdET0v1bzPle9X8xyoDd6op0zCSq0MuU6ryKzZt7jAyWSjx7IFo+dz7nPnAI85OPmGY1yQ+o12KZQtqIsT2dDRZW3pegyeNln9QeW0I9hBQRKHDfLQSVp41Mc0PYJFnKVHgufHDwDO/h+xiYcrFecP3E97jMlc/LCkWEdUQv0os3Dk9o38Z0lJMmHltNZGY9UcyqfT6aS4EWGaYf7XT74JO4zw2SyB3+YuohwRdvvanrlJ50cAOFTPmkEukbp2p6cYGQdwZHwGPMBbqphnTEzeKWhkjvok+MeBydQu25bC76E1HAYFlqJBviFuS3yE7xsNcOf1FtSoCTZ5wDUnc5hiuJtIUxhFjpnh3CargX3oax2dhayLMlWQ== ivan@fl522 - - pyry_ssh_key_pub: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDSWuT9Zh6EPKKkvB8LTKahEipIZez3whoa8WxDCzT8grVImfKpszU5vpUlF+gz9rXooDVE4yQp3g5Dxm2keYatyDa22OzbqYC2QeWteKqr+s2GLcAc/faHUMNiP9pt46C2W/h/zI21cu3KTbbPl9MGFRbP82kBVsiwFTT2aZd62cbV8/GEj7yOZyyULU5f0MoKvHxs97zVvkzNCY3byS/X3VdREUUFe5GdD9RL5zqIEeFlwFYBNlh56diwW/g4GDJ0uQPn77Pw2nFPdli4ibP3ftSIX+Ys8aWHZwzvxNhZocmwrxGRzpTqweeXL8XKgRfhnqT6g7GFFOyaKftB0hsFIkG1gb8TQ2GCxKfRqhDePaey5+Q4qkyGhRHsteOocFVYNucKjf1rD3titb2+BHTCYt4oNqPyr4BmbfJ9qKj/Fw/8mNIw9uxKRZr57a42lqCZa6CglHo0P/Fr7xjqL2HuUcfnl5g7dJyalZhiPVr535cPfFYjLYWl8WvFsyfLCphQDKdi9THpY93V4bwB03M4gs4lwluVUG6/GOI7ONW61BoH97NduBb9pCYrr5suQgGsAi0oY97XaidpO4AAjfiTvMBlMiGPjtgGI5A2rYcUa6tGrsFu/MBQ8TNTv2iOUt1sCPlXq5sqLKBlj4DnYlC1F1v5kpN7rnr2M0MnCnyHLw== openpgp:0xC082E95A - - unix_users: - - username: root - sudo: yes - - username: ivan - sudo: yes - authorized_keys: | - {{ ivan_ssh_key_pub }} - - username: pyry - sudo: yes - authorized_keys: | - {{ pyry_ssh_key_pub }} - - username: liw - sudo: yes - authorized_keys: | - {{ liw_ssh_key_pub }} - - username: ickapi - - sources_lists: - - repo: "deb http://deb.debian.org/debian buster main" diff --git a/ick-ui.yml b/ick-ui.yml deleted file mode 100644 index eba69b8..0000000 --- a/ick-ui.yml +++ /dev/null @@ -1,37 +0,0 @@ -- hosts: ui - remote_user: root - become: yes - roles: - - sane_debian_system - - unix_users - - comfortable - - apache_server - - ick_ui - vars: - hostname: ick - - wm_ssh_key_pub: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key_pub') }}" - - unix_users: - - username: root - authorized_keys: | - {{ wm_ssh_key_pub }} - {{ demo_wm_ssh_key_pub }} - {{ liw_ssh_key_pub }} - - username: ivan - sudo: yes - authorized_keys: | - {{ ivan_ssh_key_pub }} - - letsencrypt: yes - letsencrypt_email: liw@liw.fi - - static_sites: - - domain: ick-ui.vm.liw.fi - owner: root - ownermail: liw@liw.fi - letsencrypt: yes - - sources_lists: - - repo: "deb https://deb.nodesource.com/node_10.x stretch main" - signing_key: "{{ nodesource_signing_key }}" diff --git a/ick.hz b/ick.hz deleted file mode 100644 index 71294ff..0000000 --- a/ick.hz +++ /dev/null @@ -1,5 +0,0 @@ -defaults: - type: cx11 - image: debian-9 -hosts: - - name: ui diff --git a/ick2.yml b/ick2.yml deleted file mode 100644 index f81d77d..0000000 --- a/ick2.yml +++ /dev/null @@ -1,23 +0,0 @@ -- hosts: controller - remote_user: root - become: yes - roles: - - sane_debian_system - - comfortable - - unix_users - - haproxy - - qvisqve - - ick-controller - - ick-artifact-store - - apt_repository - - ick-notifier - - ick-worker - - ickweb - vars: - hostname: ickhost - controller_domain: "{{ ick_domain }}" - qvisqve_domain: "{{ controller_domain }}" - artifact_store_domain: "{{ controller_domain }}" - apt_domain: "{{ controller_domain }}" - apt_domain_set: true - notify_domain: "{{ controller_domain }}" diff --git a/ickdev.hz b/ickdev.hz deleted file mode 100644 index 142281e..0000000 --- a/ickdev.hz +++ /dev/null @@ -1,7 +0,0 @@ -defaults: - type: cx11 - image: debian-9 -hosts: - - name: api - type: cx21 - groups: [ickhost] diff --git a/icktest.hz b/icktest.hz deleted file mode 100644 index e03a9fd..0000000 --- a/icktest.hz +++ /dev/null @@ -1,8 +0,0 @@ -defaults: - type: cx11 - image: debian-10 -hosts: - - name: ick - groups: [ickhost, controller] - - name: worker1 - groups: [workers, ickhost] diff --git a/ickweb.hz b/ickweb.hz deleted file mode 100644 index 0f8c8f5..0000000 --- a/ickweb.hz +++ /dev/null @@ -1,5 +0,0 @@ -defaults: - type: cx11 - image: debian-9 -hosts: - - name: demo diff --git a/ickweb.yml b/ickweb.yml deleted file mode 100644 index a78a82c..0000000 --- a/ickweb.yml +++ /dev/null @@ -1,18 +0,0 @@ -- hosts: demo - remote_user: root - become: yes - roles: - - sane_debian_system - - unix_users - - ickweb - vars: - hostname: ickweb - locales: - - fi_FI.UTF-8 - - en_GB.UTF-8 - debian_codename: stretch - sources_lists: - - repo: "deb http://deb.debian.org/debian stretch-backports main" - qvisqve_token_public_key: "{{ lookup('pipe', 'pass show qvisqve/token_key_pub') }}" - - letsencrypt_email: liw@liw.fi diff --git a/muck.hz b/muck.hz deleted file mode 100644 index 9b7729e..0000000 --- a/muck.hz +++ /dev/null @@ -1,5 +0,0 @@ -defaults: - type: cx11 - image: debian-9 -hosts: - - name: muck diff --git a/primus-workers.hz b/primus-workers.hz deleted file mode 100644 index b0b4419..0000000 --- a/primus-workers.hz +++ /dev/null @@ -1,12 +0,0 @@ -defaults: - type: cx21 - image: debian-9 -hosts: - - name: asterix - groups: [workers, ickhost] - - name: obelix - groups: [workers, ickhost] - - name: idefix - groups: [workers, ickhost] - - name: akvavitix - groups: [workers, ickhost] diff --git a/primus.hz b/primus.hz deleted file mode 100644 index c2dd912..0000000 --- a/primus.hz +++ /dev/null @@ -1,6 +0,0 @@ -defaults: - type: cx31 - image: debian-10 -hosts: - - name: ick - groups: [ickhost, controller, qvisqve, notify] diff --git a/web.yml b/web.yml deleted file mode 100644 index ccb94a7..0000000 --- a/web.yml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: web - remote_user: root - become: no - roles: - - sane_debian_system - - unix_users - - apache_server - - vars: - hostname: web - debian_codename: stretch - debian_mirror: deb.debian.org - debian_mirror_src: deb.debian.org - - static_sites: - - domain: files.liw.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: ick.liw.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: ick-staging.liw.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: mallorca.liw.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: code.liw.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: bugs.liw.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: distix.obnam.org - ownermail: liw@liw.fi - owner: ickliwfi - - - domain: tickets.distix.eu - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: liw.iki.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: noir.liw.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: ick-support.liw.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: www.docstory.fi - owner: ickliwfi - ownermail: liw@liw.fi - - - domain: wedding.docstory.fi - owner: ickliwfi - ownermail: liw@liw.fi - - unix_users: - - username: ickliwfi - comment: Ick website - authorized_keys: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvVYqyPen0CFhfx9dzzCKNbQ7fUpbCRdlQ/PI4sAv5R+gjUYjZJ3HQQhdkEx6mwY+fGYgGIAY9xiTi+BzXSPPtuWUypB2/ee+Dh5Uqica1TCj/3txmFGE7qwD+AqoJYbDAD1x17AaCIEDgHv2wOQ2o8GlOKTK9mGgvZWTUgIUF7PObotg8/M6TV4NO3of7ZSJ0yqumU/GLaJ8UkvYVQ3Gj0w8tbX6xiJKcOnMyM+P+JIFRKKi/SzjymVfAie9OAlIcDEYTeT6dtqWYB6hT0/40D0ZcxOfIg07/m4A956hH9AzRKuz01w2phP2zQyHRUSOCWa5EWF/H9snxpeE5Ein liw@exolobe3 -- cgit v1.2.1