- Fixed httpS omission

- Removed explicit SSL types from nginx
- Changed default database name to 'metadata' in both postgres & torkeep config files
- Changed the GMS after conversation with Patrick Dowler at CADC (still to be tested - API token generation etc.)
- Separated the dbase docker-compose from the rest of the services (dbase can now be stateful if required AND dbase needs to be setup before starting the torkeep service)
- Updated the 'reg' component to use a new image (bug fix for the availability API)

Author: slloyd-src

config/cadc-registry.properties

@@ -1,5 +1,5 @@
 ## configure RegistryClient (required)
-ca.nrc.cadc.reg.client.RegistryClient.baseURL =  http://src-data-repo.co.uk/reg
+ca.nrc.cadc.reg.client.RegistryClient.baseURL =  https://src-data-repo.co.uk/reg
 
 ## SRC IAM prototype
 ivo://ivoa.net/sso#OpenID = https://ska-iam.stfc.ac.uk/

config/nginx/nginx.conf

@@ -2,16 +2,13 @@ events {}
 
 http {
     server {
-        listen 80;
+	listen 80;
 	listen 443 ssl;
         server_name src-data-repo.co.uk;
 
 	ssl_certificate /etc/nginx/ssl/server.crt;
         ssl_certificate_key /etc/nginx/ssl/server.key;
 
-	ssl_protocols TLSv1.3 TLSv1.2;
-        ssl_ciphers HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!SHA1:!DSS;
-
 
         location /reg/ {
             proxy_pass http://localhost:8881;

config/postgres/init-content-schemas.sh

@@ -1,2 +1,2 @@
-CATALOGS="cadctest"
+CATALOGS="metadata"
 SCHEMAS="caom2 tap_schema tap_upload uws inventory vospace"

config/reg/reg-resource-caps.properties

@@ -1,7 +1,8 @@
 #First, global services:
 
 ivo://skao.int/reg = https://src-data-repo.co.uk/reg/capabilities
-ivo://skao.int/gms = https://ska-iam.stfc.ac.uk/gms/capabilities
+#ivo://skao.int/gms = https://ska-iam.stfc.ac.uk/gms/capabilities
+ivo://skao.int/gms = https://ska-gms.stfc.ac.uk/gms/capabilities
 ivo://skao.int/baldur = https://src-data-repo.co.uk/baldur/capabilities
 
 #The `reg` self-registration is not actually used by anything, but it claims that resourceID for that service. The `gms` URL is probably wrong - the example is just to show it's related to IAM server but the value will come from purple team.

docker-compose-dbase.yml

@@ -0,0 +1,16 @@
+services:
+  pg15test:
+    image: stephenlloyd/uksrc:cadc-postgresql-dev
+    container_name: pg15test
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./config/postgres:/config
+      - ./config/cacerts:/config/cacerts
+    restart: always
+    networks:
+      - mynetwork
+
+networks:
+  mynetwork:
+    driver: bridge

docker-compose.yml

@@ -1,39 +1,41 @@
 services:
   reg:
-    image: images.opencadc.org/core/reg:1.1.0
+    image: images.opencadc.org/core/reg:1.1.1
     container_name: reg
     user: "tomcat:tomcat"
     ports:
       - "8881:8080"
     volumes:
       - ./config/reg:/config
       - ./config/cacerts:/config/cacerts
+      - ./config/cadc-registry.properties:/config/cadc-registry.properties:ro
     networks:
       - mynetwork
 
   baldur:
-    image: stephenlloyd/uksrc:baldur
+    image: images.opencadc.org/storage-inventory/baldur:0.3.7
     container_name: baldur
     user: "tomcat:tomcat"
     ports:
       - "8882:8080"
     volumes:
       - ./config/baldur:/config
       - ./config/cacerts:/config/cacerts
+      - ./config/cadc-registry.properties:/config/cadc-registry.properties:ro
     networks:
       - mynetwork
 
-  pg15test:
-    image: stephenlloyd/uksrc:cadc-postgresql-dev
-    container_name: pg15test
-    ports:
-      - "5432:5432"
-    volumes:
-      - ./config/postgres:/config
-      - ./config/cacerts:/config/cacerts
-    restart: always
-    networks:
-      - mynetwork
+#  pg15test:
+#    image: stephenlloyd/uksrc:cadc-postgresql-dev
+#    container_name: pg15test
+#    ports:
+#      - "5432:5432"
+#    volumes:
+#      - ./config/postgres:/config
+#      - ./config/cacerts:/config/cacerts
+#    restart: always
+#    networks:
+#      - mynetwork
 
   torkeep:
     image: images.opencadc.org/caom2/torkeep:0.1.4
@@ -46,6 +48,7 @@ services:
       - ./config/cacerts:/config/cacerts
       - ./config/cadc-registry.properties:/config/cadc-registry.properties:ro
       - ./logs:/logs:ro
+    restart: always
     networks:
       - mynetwork