Skip to content

Commit

Permalink
Merge pull request #322 from KPMP/develop
Browse files Browse the repository at this point in the history
DLU/DMD Release May 2024
  • Loading branch information
rlreamy authored May 21, 2024
2 parents 27da688 + 0ec7a2e commit 88c9707
Show file tree
Hide file tree
Showing 8 changed files with 145 additions and 36 deletions.
62 changes: 62 additions & 0 deletions atlas/apache-atlas/container_files/etc/httpd/conf.d/virt-ssl.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
ServerName ENV_APACHE_SERVER_NAME
Listen 443

<VirtualHost *:80>

ServerName ENV_APACHE_SERVER_NAME
RewriteEngine on
RewriteCond %{HTTPS} off
RewriteRule ^/(.*)$ https://ENV_APACHE_SERVER_NAME/$1 [L,R]

</VirtualHost>

<VirtualHost *:443>

ServerName ENV_APACHE_SERVER_NAME

SSLEngine on
SSLProtocol +TLSv1.2
SSLHonorCipherOrder on
SSLCipherSuite HIGH:!aNULL:!MD5
SSLCertificateFile /certs/kpmp.crt
SSLCertificateKeyFile /certs/kpmp.key
SSLCACertificateFile /certs/InCommon-intermediate.crt

<Directory "/var/www/html">
RewriteEngine on

# Handle existing files or directories as is
RewriteCond %{REQUEST_FILENAME} -f [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^ - [L]


# Send all non-existant file/directory requests to /repository to /repository/index.html
RewriteCond %{REQUEST_URI} /repository*
RewriteRule ^ /repository/index.html [L]

# Send all non-existant file/directory requests to /repository2 to /repository2/index.html
RewriteCond %{REQUEST_URI} /repository2*
RewriteRule ^ /repository2/index.html

# Send all non-existant file/directory requests to /spatial-viewer to /spatial-viewer/index.html
RewriteCond %{REQUEST_URI} /spatial-viewer*
RewriteRule ^ /spatial-viewer/index.html [L]

# Send all non-existant file/directory request to / to /index.html
RewriteCond %{REQUEST_URI} /*
RewriteRule ^ /index.html

</Directory>

RewriteEngine on
RewriteRule "^/endpoint/(.*?)$" "http://ENV_ARRANGER_SERVER_ADDRESS:5050/endpoint/$1" [P]
RewriteRule "^/explorer/v1/error" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3030/v1/error" [P]
RewriteRule "^/api/v1/clearCache" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3030/v1/clearCache" [P]
RewriteRule "^/api/(.*)$" "http://ENV_FILE_SERVER_ADDRESS:5000/$1" [P]
RewriteRule "^/graphql" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3030/graphql" [P]
RewriteRule "^/spatial-viewer/graphql" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3040/graphql" [P]
RewriteRule "^/spatial-viewer/search/(.*)$" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3002/$1" [P]

</VirtualHost>

3 changes: 0 additions & 3 deletions atlas/knowledge-environment/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ services:
- MYSQL_USER=${ENV_MYSQL_USER}
- MYSQL_PASSWORD=${ENV_MYSQL_PASSWORD}
- BUCKET_NAME=${ENV_BUCKET_NAME}
- MYSQL_HOST=${ENV_MYSQL_HOST}
- MYSQL_USER=${ENV_MYSQL_USER}
- MYSQL_PASSWORD=${ENV_MYSQL_PASSWORD}
- "TZ=America/Detroit"
networks:
local:
Expand Down
64 changes: 32 additions & 32 deletions dataLake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,78 +14,78 @@ if [ "$environment" == "" ] || [ "$cmd" == "" ]; then
echo $USAGE
elif [ "$environment" == "dev" ] && [ "$2" == "down" ]; then
cd eridanus
/usr/local/bin/docker-compose -f docker-compose.dev.yml $cmd
/usr/local/bin/docker compose -f docker-compose.dev.yml $cmd
cd ../stateManager
/usr/local/bin/docker-compose -f docker-compose.dev.yml $cmd
/usr/local/bin/docker compose -f docker-compose.dev.yml $cmd
cd ../orion
/usr/local/bin/docker-compose -f docker-compose.dev.yml $cmd
/usr/local/bin/docker compose -f docker-compose.dev.yml $cmd
cd ../libra
/usr/local/bin/docker-compose -f docker-compose.local.yml $cmd
/usr/local/bin/docker compose -f docker-compose.local.yml $cmd
elif [ "$environment" == "dev" ] && [ "$2" == "up" ]; then
cd orion
/usr/local/bin/docker-compose -f docker-compose.dev.yml $cmd
/usr/local/bin/docker compose -f docker-compose.dev.yml $cmd
cd ../eridanus
/usr/local/bin/docker-compose -f docker-compose.dev.yml $cmd
/usr/local/bin/docker compose -f docker-compose.dev.yml $cmd
cd ../stateManager
/usr/local/bin/docker-compose -f docker-compose.dev.yml $cmd
/usr/local/bin/docker compose -f docker-compose.dev.yml $cmd
cd ../libra
/usr/local/bin/docker-compose -f docker-compose.local.yml $cmd
/usr/local/bin/docker compose -f docker-compose.local.yml $cmd
elif [ "$environment" == "dev" ] && [ "$2" == "restart" ]; then
cd orion
/usr/local/bin/docker-compose -f docker-compose.dev.yml $down
/usr/local/bin/docker compose -f docker-compose.dev.yml $down
cd ../eridanus
/usr/local/bin/docker-compose -f docker-compose.dev.yml $down
/usr/local/bin/docker compose -f docker-compose.dev.yml $down
cd ../stateManager
/usr/local/bin/docker-compose -f docker-compose.dev.yml $down
/usr/local/bin/docker compose -f docker-compose.dev.yml $down
cd ../libra
/usr/local/bin/docker-compose -f docker-compose.local.yml $down
/usr/local/bin/docker compose -f docker-compose.local.yml $down
sleep 5s

cd ../orion
/usr/local/bin/docker-compose -f docker-compose.dev.yml $up
/usr/local/bin/docker compose -f docker-compose.dev.yml $up
cd ../eridanus
/usr/local/bin/docker-compose -f docker-compose.dev.yml $up
/usr/local/bin/docker compose -f docker-compose.dev.yml $up
cd ../stateManager
/usr/local/bin/docker-compose -f docker-compose.dev.yml $up
/usr/local/bin/docker compose -f docker-compose.dev.yml $up
cd ../libra
/usr/local/bin/docker-compose -f docker-compose.local.yml $up
/usr/local/bin/docker compose -f docker-compose.local.yml $up
elif [ $environment == "prod" ] && [ "$2" == "down" ]; then
cd eridanus
/usr/local/bin/docker-compose -f docker-compose.prod.yml $cmd
/usr/local/bin/docker compose -f docker-compose.prod.yml $cmd
cd ../stateManager
/usr/local/bin/docker-compose -f docker-compose.prod.yml $cmd
/usr/local/bin/docker compose -f docker-compose.prod.yml $cmd
cd ../orion
/usr/local/bin/docker-compose -f docker-compose.prod.yml $cmd
/usr/local/bin/docker compose -f docker-compose.prod.yml $cmd
cd ../dataLakeProxyServer
/usr/local/bin/docker-compose $cmd
/usr/local/bin/docker compose $cmd
cd ../libra
/usr/local/bin/docker-compose -f docker-compose.prod.yml $cmd
/usr/local/bin/docker compose -f docker-compose.prod.yml $cmd
elif [ $environment == "prod" ] && [ "$2" == "up" ]; then
cd dataLakeProxyServer
/usr/local/bin/docker-compose $cmd
/usr/local/bin/docker compose $cmd
cd ../eridanus
/usr/local/bin/docker-compose -f docker-compose.prod.yml $cmd
/usr/local/bin/docker compose -f docker-compose.prod.yml $cmd
cd ../stateManager
/usr/local/bin/docker-compose -f docker-compose.prod.yml $cmd
/usr/local/bin/docker compose -f docker-compose.prod.yml $cmd
cd ../orion
docker-compose -f docker-compose.prod.yml $cmd
docker compose -f docker-compose.prod.yml $cmd
cd ../libra
/usr/local/bin/docker-compose -f docker-compose.prod.yml $cmd
/usr/local/bin/docker compose -f docker-compose.prod.yml $cmd
elif [ $environment == "prod" ] && [ "$2" == "restart" ]; then
cd orion
/usr/local/bin/docker-compose -f docker-compose.prod.yml $down
/usr/local/bin/docker compose -f docker-compose.prod.yml $down
cd ../eridanus
/usr/local/bin/docker-compose -f docker-compose.prod.yml $down
/usr/local/bin/docker compose -f docker-compose.prod.yml $down
cd ../stateManager
/usr/local/bin/docker-compose -f docker-compose.prod.yml $down
/usr/local/bin/docker compose -f docker-compose.prod.yml $down
sleep 5s

cd ../orion
/usr/local/bin/docker-compose -f docker-compose.prod.yml $up
/usr/local/bin/docker compose -f docker-compose.prod.yml $up
cd ../eridanus
/usr/local/bin/docker-compose -f docker-compose.prod.yml $up
/usr/local/bin/docker compose -f docker-compose.prod.yml $up
cd ../stateManager
/usr/local/bin/docker-compose -f docker-compose.prod.yml $up
/usr/local/bin/docker compose -f docker-compose.prod.yml $up
else
echo $USAGE
fi
1 change: 1 addition & 0 deletions eridanus/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ services:
max-size: "10m"
max-file: "5"


volumes:
esdata:
mariadbdata:
Expand Down
2 changes: 1 addition & 1 deletion images/apache/apache-dl-proxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN chown -R _shibd:_shibd /etc/shibboleth/
RUN chown -R _shibd:_shibd /var/cache/shibboleth/

RUN ln -s /opt/bin/httpd-shib-foreground /usr/local/bin && ln -s /opt/etc/httpd/conf.d/ssl.conf /etc/apache2/conf-enabled/ssl.conf && ln -s /opt/etc/httpd/conf.d/virt.conf /etc/apache2/conf-enabled/virt.conf && ln -s /usr/share/zoneinfo/America/Detroit /etc/localtime
RUN cp /etc/apache2/mods-available/ssl.load /etc/apache2/mods-enabled && cp /etc/apache2/mods-available/socache_shmcb.load /etc/apache2/mods-enabled && cp /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled
RUN cp /etc/apache2/mods-available/ssl.load /etc/apache2/mods-enabled && cp /etc/apache2/mods-available/socache_shmcb.load /etc/apache2/mods-enabled && cp /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled && cp /etc/apache2/mods-available/headers.load /etc/apache2/mods-enabled && cp /etc/apache2/mods-available/proxy.load /etc/apache2/mods-enabled && cp /etc/apache2/mods-available/proxy_http.load /etc/apache2/mods-enabled

RUN curl -k https://ds.incommon.org/certs/inc-md-cert.pem -o /etc/ssl/certs/inc-md-cert.pem
COPY ./container_files/etc/shibboleth/attribute-map.xml /etc/shibboleth/attribute-map.xml
Expand Down
1 change: 1 addition & 0 deletions libra/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ services:
- mongo_db=${mongo_db}
- spectrack_token=${spectrack_token}
- spectrack_base_url=${spectrack_base_url}
mem_limit: 3g
volumes:
- "${ENV_DATALAKE_FILE_DIR}:/data"
- "${ENV_GLOBUS_FILE_MOUNT}:/globus"
Expand Down
47 changes: 47 additions & 0 deletions libra/docker-compose.dmd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
version: "3"
services:

mariadb:
container_name: eridanus-mariadb
image: mariadb:10.8.2
restart: always
environment:
MYSQL_ROOT_PASSWORD: ${ENV_MYSQL_PASSWORD}
volumes:
- mariadbdata:/var/lib/mysql
ports:
- 3307:3306
networks:
local:
aliases:
- mariadb
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "5"

adminer:
container_name: eridanus-adminer
image: adminer
restart: always
environment:
TZ: "America/Detroit"
ports:
- 9090:8080
networks:
local:
aliases:
- adminer
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "5"

volumes:
mariadbdata:

networks:
local:

1 change: 1 addition & 0 deletions libra/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ services:
- mongo_db=${mongo_db}
- spectrack_token=${spectrack_token}
- spectrack_base_url=${spectrack_base_url}
mem_limit: 6g
volumes:
- "${ENV_DATALAKE_FILE_DIR}:/data"
- "${ENV_GLOBUS_FILE_MOUNT}:/globus"
Expand Down

0 comments on commit 88c9707

Please sign in to comment.