Skip to content

Commit ebfdbd9

Browse files
committed
-added group for auth testing
- added Patrick's test Observation
1 parent 4936dd9 commit ebfdbd9

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

config/baldur/baldur.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ test.anon = true
1818
org.opencadc.baldur.entry = EMERLIN
1919
EMERLIN.pattern = ^jbo:EMERLIN/.*
2020
EMERLIN.anon = true
21-
#EMERLIN.readOnlyGroups = ivo://skao.int/gms?prototyping-groups/mini-src/platform-users
22-
#EMERLIN.readWriteGroups = ivo://skao.int/gms?prototyping-groups/mini-src/platform-users
21+
EMERLIN.readOnlyGroups = ivo://skao.int/gms?prototyping-groups/mini-src/platform-users
22+
EMERLIN.readWriteGroups = ivo://skao.int/gms?prototyping-groups/mini-src/platform-users

config/reg/reg-resource-caps.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ ivo://skao.int/baldur = https://src-data-repo.co.uk/baldur/capabilities
1111

1212
#Then SRC node services:
1313

14-
ivo://swesrc.chalmers.se/luskan = https://se.swesrc.chalmers.se/luskan/capabilities
15-
ivo://swesrc.chalmers.se/minoc = https://se.swesrc.chalmers.se/minoc/capabilities
14+
#ivo://swesrc.chalmers.se/luskan = https://se.swesrc.chalmers.se/luskan/capabilities
15+
#ivo://swesrc.chalmers.se/minoc = https://se.swesrc.chalmers.se/minoc/capabilities

config/torkeep/catalina.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tomcat.connector.proxyName=src-data-repo.co.uk
1717
tomcat.connector.proxyPort=443
1818

1919
## enable no-op authenticator plugin -- obsolete because of the useage of the OIDC IdentityManager below
20-
ca.nrc.cadc.auth.Authenticator=ca.nrc.cadc.auth.NoOpAuthenticator
20+
#ca.nrc.cadc.auth.Authenticator=ca.nrc.cadc.auth.NoOpAuthenticator
2121

2222
## enable OIDC IdentityManager
2323
#ca.nrc.cadc.auth.IdentityManager=org.opencadc.auth.StandardIdentityManager

docker-compose.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ services:
3939
- ./config/torkeep:/config
4040
- ./config/cacerts:/config/cacerts
4141
- ./config/cadc-registry.properties:/config/cadc-registry.properties:ro
42-
- ./logs:/logs:ro
4342
restart: always
4443
networks:
4544
- mynetwork
@@ -49,9 +48,9 @@ services:
4948
network_mode: "host"
5049
container_name: nginx
5150
volumes:
52-
- ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
53-
- ./ssl/server.crt:/etc/nginx/ssl/server.crt
54-
- ./ssl/server.key:/etc/nginx/ssl/server.key
51+
- ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
52+
- ./ssl/server.crt:/etc/nginx/ssl/server.crt:ro
53+
- ./ssl/server.key:/etc/nginx/ssl/server.key:ro
5554

5655
networks:
5756
mynetwork:

minimal-test.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<caom2:Observation xmlns:caom2="http://www.opencadc.org/caom2/xml/v2.4"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:type="caom2:SimpleObservation"
5+
caom2:id="445dc3b9-3a18-48b0-b0a7-a50114cb7659">
6+
<caom2:collection>EMERLIN</caom2:collection>
7+
<caom2:observationID>minimal-observation</caom2:observationID>
8+
<caom2:algorithm>
9+
<caom2:name>exposure</caom2:name>
10+
</caom2:algorithm>
11+
</caom2:Observation>

0 commit comments

Comments
 (0)