From e610edb05d471ecc327c0b38048c0441bfef8fb1 Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Tue, 14 May 2024 17:08:05 -0400
Subject: [PATCH] Move smart1/jeltz to v2

---
 env/galaxy/files/sites/datacache/index.html   |  50 --------
 .../host_vars/jeltz.galaxyproject.org.yml     | 118 ------------------
 .../host_vars/smart1.galaxyproject.org.yml    | 103 ---------------
 env/galaxy/templates/nginx/datacache.j2       |  40 ------
 4 files changed, 311 deletions(-)
 delete mode 100644 env/galaxy/files/sites/datacache/index.html
 delete mode 100644 env/galaxy/host_vars/jeltz.galaxyproject.org.yml
 delete mode 100644 env/galaxy/host_vars/smart1.galaxyproject.org.yml
 delete mode 100644 env/galaxy/templates/nginx/datacache.j2
diff --git a/env/galaxy/files/sites/datacache/index.html b/env/galaxy/files/sites/datacache/index.html
deleted file mode 100644
index 7bb01284..00000000
--- a/env/galaxy/files/sites/datacache/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <meta name="viewport" content="maximum-scale=1.0">
-        <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-
-        <title>
-            Galaxy Datacache
-        </title>
-        <link rel="index" href="/"/>
-    </head>
-
-    <body>
-        <h1>Galaxy Datacache</h1>
-        <p>
-            This server contains a copy of the reference data used on
-            <a href="https://usegalaxy.org/">usegalaxy.org</a>. In addition to HTTP, you can access it via multiple
-            other methods:
-        </p>
-        <ul>
-            <li><a href="https://rsync.samba.org/">rsync</a>, via <code>rsync://datacache.galaxyproject.org/</code></li>
-            <li><a href="http://cvmfs.readthedocs.io/">CernVM-FS (CVMFS)</a>, from the <a
-                   href="http://cvmfs.readthedocs.io/en/stable/cpt-configure.html#stratum-1-list">Stratum 1</a>
-                servers available, listed on the <a href="https://galaxyproject.org/admin/reference-data-repo/#cvmfs-server-details">Galaxy Hub</a>
-            </li>
-            <li>The
-                <a href="https://github.com/galaxyproject/tools-iuc/tree/master/data_managers/data_manager_rsync_g2">
-                    rsync Data Manager</a>.
-            </li>
-        </ul>
-        <h2>Contents</h2>
-        <ul>
-            <li><a href="/managed">/managed</a> - Managed Galaxy Data (created with Galaxy <a
-                   href="https://galaxyproject.org/admin/tools/data-managers/">Data Managers</a>)</li>
-            <li><a href="/indexes">/indexes</a> - Galaxy Genome Indexes (pre-Data Manager manually curated data)</li>
-            <li><a href="/refgenomes-databio">/refgenomes-databio</a> <b>(alpha)</b> - <a
-                   href="http://refgenie.databio.org/">refgenie</a> server <a
-                   href="http://refgenomes.databio.org/">refgenomes.databio.org</a> mirrored to CVMFS repository
-                   refgenomes-databio.galaxyproject.org</li>
-            <li><a href="/singularity">/singularity</a> - <a
-                   href="https://biocontainers.pro/">BioContainers</a> <a
-                   href="https://sylabs.io/singularity/">Singularity</a> images mirrored to CVMFS repository
-                   singularity.galaxyproject.org. This is a convenience to browse the repository, the upstream source
-                   that it is mirrored from can be found at <a
-                   href="https://depot.galaxyproject.org/singularity">depot.galaxyproject.org/singularity</a></li>
-            <li><a href="/idc">/idc</a> - Galaxy <a
-                   href="https://github.com/galaxyproject/idc">Intergalactic Data Commission</a></li>
-    </body>
-</html>
diff --git a/env/galaxy/host_vars/jeltz.galaxyproject.org.yml b/env/galaxy/host_vars/jeltz.galaxyproject.org.yml
deleted file mode 100644
index e6ed727d..00000000
--- a/env/galaxy/host_vars/jeltz.galaxyproject.org.yml
+++ /dev/null
@@ -1,118 +0,0 @@
----
-
-host_directories:
-  - path: /srv/nginx/datacache.galaxyproject.org/root
-
-host_files:
-  - src: files/sites/datacache/index.html
-    dest: /srv/nginx/datacache.galaxyproject.org/root/index.html
-
-host_packages:
-  - rsync
-
-host_services:
-  - name: rsyncd
-    state: started
-    enabled: 'yes'
-
-host_templates:
-  - dest: /etc/rsyncd.conf
-    src: ini.j2
-    contents:
-      indexes:
-        path: /cvmfs/data.galaxyproject.org/byhand
-        comment: Galaxy Genome Indexes
-        'use chroot': 'yes'
-        uid: nobody
-        gid: nobody
-        'read only': 'yes'
-        list: 'yes'
-        exclude: '*/tmp/* */work/* bin/*'
-      location:
-        path: /cvmfs/data.galaxyproject.org/byhand/location
-        comment: Galaxy Data Location Files
-        'use chroot': 'yes'
-        uid: nobody
-        gid: nobody
-        'read only': 'yes'
-        list: 'yes'
-      managed:
-        path: /cvmfs/data.galaxyproject.org/managed
-        comment: Managed Galaxy Data
-        'use chroot': 'yes'
-        uid: nobody
-        gid: nobody
-        'read only': 'yes'
-        list: 'yes'
-      byhand:
-        path: /cvmfs/data.galaxyproject.org/byhand
-        comment: Alternate mount point for /indexes/ for rsync data manager
-        'use chroot': 'yes'
-        uid: nobody
-        gid: nobody
-        'read only': 'yes'
-        list: 'yes'
-        exclude: '*/tmp/* */work/* bin/*'
-      idc:
-        path: /cvmfs/idc.galaxyproject.org
-        comment: Galaxy Intergalactic Data Commission
-        'use chroot': 'yes'
-        uid: nobody
-        gid: nobody
-        'read only': 'yes'
-        list: 'yes'
-        exclude: '*/tmp/* */work/* bin/*'
-
-host_firewall_rules:
-  - service: http
-    state: enabled
-    permanent: yes
-    immediate: yes
-  - service: rsyncd
-    state: enabled
-    permanent: yes
-    immediate: yes
-
-  # FIXME: technically these aren't right but as Swarm is being decommissioned it's not critical
-  - source: 129.114.17.191/32
-    zone: public
-    state: enabled
-    permanent: yes
-    immediate: yes
-  - source: 149.165.168.157/32
-    zone: public
-    state: enabled
-    permanent: yes
-    immediate: yes
-  - port: 2377/tcp
-    zone: public
-    state: enabled
-    permanent: yes
-    immediate: yes
-  - port: 7946/tcp
-    zone: public
-    state: enabled
-    permanent: yes
-    immediate: yes
-  - port: 7946/tcp
-    zone: public
-    state: enabled
-    permanent: yes
-    immediate: yes
-  - port: 7946/udp
-    zone: public
-    state: enabled
-    permanent: yes
-    immediate: yes
-  - port: 4789/udp
-    zone: public
-    state: enabled
-    permanent: yes
-    immediate: yes
-
-# datacache.galaxyproject.org
-nginx_enable_default_server: false
-nginx_configs:
-  - datacache
-
-cvmfs_quota_limit: 2048
diff --git a/env/galaxy/host_vars/smart1.galaxyproject.org.yml b/env/galaxy/host_vars/smart1.galaxyproject.org.yml
deleted file mode 100644
index 36c2aa73..00000000
--- a/env/galaxy/host_vars/smart1.galaxyproject.org.yml
+++ /dev/null
@@ -1,103 +0,0 @@
----
-
-smartos_images:
-  # centos-7 20190122 linux zvol
-  - uuid: d6e56c0e-1e51-11e9-8ff1-2fecf38a5566
-    state: present
-  # debian-10 20200508 linux zvol
-  - uuid: 9bcfe5cc-007d-4f23-bc8a-7e7b4d0c537e
-    state: present
-  # ubuntu-16.04 20170403 linux lx-dataset
-  # For manual upgrade to ubuntu-20.04 image from OmniOS
-  # Images from https://github.com/omniosorg/lx-images
-  # Process from https://smartos.topicbox.com/groups/smartos-discuss/T68ebed9ce2f20ae0/fresh-lx-zone-linux-images-for-ubuntu-18-04-and-20-04
-  #   1. Created a zone with the latest available Ubuntu 16.04 LX image as a base (7b5981c4-1889-11e7-b4c5-3f3bdfc9b88b)
-  #   2. Moved the existing /zones/<UUID>/root directory elsewhere
-  #   3. Extracted the latest 20.04 dataset from https://github.com/omniosorg/lx-images/releases into /zones/<UUID>/root/
-  #   4. UNNECESSARY (created on boot): Copied missing SmartOS directories from the old root/ directory (e.g., "native/")
-  - uuid: 7b5981c4-1889-11e7-b4c5-3f3bdfc9b88b
-    state: present
-  # ubuntu-certified-18.04 20190627.1.1 linux zvol
-  - uuid: 9aa48095-da9d-41ca-a094-31d1fb476b98
-    state: present
-
-smartos_vms:
-  - name: jeltz
-    brand: kvm
-    ram: "2048"
-    vcpus: "2"
-    quota: 32768
-    resolvers: "{{ smartos_resolvers }}"
-    nics:
-      - nic_tag: external
-        ip: 128.118.250.24
-        netmask: 255.255.255.224
-        gateway: 128.118.250.1
-        vlan_id: 306
-        model: virtio
-    disks:
-      - image_uuid: d6e56c0e-1e51-11e9-8ff1-2fecf38a5566
-        boot: true
-        model: virtio
-    delegate_dataset: true
-    customer_metadata:
-      root_authorized_keys: "{{ sshkeys.nate_coraor }}"
-  - name: eddie
-    brand: lx
-    kernel_version: 5.4.0-26-generic
-    image_uuid: 7b5981c4-1889-11e7-b4c5-3f3bdfc9b88b
-    hostname: eddie
-    max_physical_memory: 8192
-    quota: 8192
-    resolvers: "{{ smartos_resolvers }}"
-    nics:
-      - nic_tag: external
-        ip: 128.118.250.11
-        netmask: 255.255.255.224
-        gateway: 128.118.250.1
-        vlan_id: 306
-    delegate_dataset: true
-    customer_metadata:
-      root_authorized_keys: "{{ sshkeys.nate_coraor }}"
-  - name: wrx
-    brand: bhyve
-    ram: 8192
-    vcpus: 2
-    resolvers: "{{ smartos_resolvers }}"
-    nics:
-      - nic_tag: external
-        ip: 172.18.2.121
-        netmask: 255.255.255.0
-        gateway: 172.18.2.1
-        vlan_id: 406
-        model: virtio
-    disks:
-      - image_uuid: 9aa48095-da9d-41ca-a094-31d1fb476b98
-        boot: true
-        model: virtio
-      - boot: false
-        model: virtio
-        size: 32768
-    customer_metadata:
-      root_authorized_keys: "{{ sshkeys.nate_coraor }}"
-  - name: sentry
-    brand: bhyve
-    ram: 8192
-    vcpus: 4
-    resolvers: "{{ smartos_resolvers }}"
-    nics:
-      - nic_tag: external
-        ip: "{{ lookup('dig', 'sentry.galaxyproject.org') }}"
-        netmask: 255.255.255.224
-        gateway: 128.118.250.1
-        vlan_id: 306
-        model: virtio
-    disks:
-      - image_uuid: 9bcfe5cc-007d-4f23-bc8a-7e7b4d0c537e
-        boot: true
-        model: virtio
-      - boot: false
-        model: virtio
-        size: 65536
-    customer_metadata:
-      root_authorized_keys: "{{ sshkeys.nate_coraor }}"
diff --git a/env/galaxy/templates/nginx/datacache.j2 b/env/galaxy/templates/nginx/datacache.j2
deleted file mode 100644
index 822419e4..00000000
--- a/env/galaxy/templates/nginx/datacache.j2
+++ /dev/null
@@ -1,40 +0,0 @@
-##
-## This file is maintained by Ansible - CHANGES WILL BE OVERWRITTEN
-##
-
-server {
-    listen      *:80;
-    server_name datacache.galaxyproject.org;
-
-    access_log  /var/log/nginx/datacache.galaxyproject.org_access.log;
-    error_log   /var/log/nginx/datacache.galaxyproject.org_error.log;
-
-    root        /srv/nginx/datacache.galaxyproject.org/root;
-
-    location /managed {
-        alias /cvmfs/data.galaxyproject.org/managed;
-        autoindex on;
-    }
-
-    location /indexes {
-        alias /cvmfs/data.galaxyproject.org/byhand;
-        autoindex on;
-    }
-
-    location /refgenomes-databio {
-        alias /cvmfs/refgenomes-databio.galaxyproject.org;
-        autoindex on;
-    }
-
-    location /singularity {
-        alias /cvmfs/singularity.galaxyproject.org;
-        autoindex on;
-    }
-
-    location /idc {
-        alias /cvmfs/idc.galaxyproject.org;
-        autoindex on;
-    }
-}
-
-# vim: set filetype=nginx
