Skip to content
This repository has been archived by the owner on Nov 8, 2019. It is now read-only.

Commit

Permalink
#30 remove templeton code
Browse files Browse the repository at this point in the history
michael-conway committed Aug 18, 2016
1 parent 999d2d2 commit a91aa68
Showing 5 changed files with 22 additions and 112 deletions.
32 changes: 0 additions & 32 deletions ansible/roles/cas/files/de-id_cas_ssl_cert_file.crt

This file was deleted.

8 changes: 0 additions & 8 deletions ansible/roles/cas/files/dhparams.pem

This file was deleted.

23 changes: 0 additions & 23 deletions ansible/roles/cas/files/server.crt

This file was deleted.

27 changes: 0 additions & 27 deletions ansible/roles/cas/files/server.key

This file was deleted.

44 changes: 22 additions & 22 deletions ansible/roles/docker/templates/compose.yaml.j2
Original file line number Diff line number Diff line change
@@ -94,9 +94,9 @@ config_saved_searches:
image: {{ docker.registry.base }}/config_{{compose.de_env}}:{{compose.de_tag}}
container_name: config-saved-searches

config_templeton_periodic:
image: {{ docker.registry.base }}/config_{{compose.de_env}}:{{compose.de_tag}}
container_name: config-templeton
#config_templeton_periodic:
# image: {{ docker.registry.base }}/config_{{compose.de_env}}:{{compose.de_tag}}
# container_name: config-templeton

config_terrain:
image: {{ docker.registry.base }}/config_{{compose.de_env}}:{{compose.de_tag}}
@@ -443,21 +443,21 @@ saved_searches:
- /etc/localtime:/etc/localtime
- /etc/timezone:/etc/timezone

templeton_periodic:
image: discoenv/templeton:{{compose.de_tag}}
container_name: templeton-periodic
command: --mode periodic --config /etc/iplant/de/templeton-periodic.properties
restart: on-failure:3
#ports:
# - "{{templeton_periodic.port}}:60000"
log_driver: "syslog"
log_opt:
tag: templeton
volumes_from:
- config_templeton_periodic
volumes:
- /etc/localtime:/etc/localtime
- /etc/timezone:/etc/timezone
#templeton_periodic:
# image: discoenv/templeton:{{compose.de_tag}}
# container_name: templeton-periodic
# command: --mode periodic --config /etc/iplant/de/templeton-periodic.properties
# restart: on-failure:3
# #ports:
# # - "{{templeton_periodic.port}}:60000"
# log_driver: "syslog"
# log_opt:
# syslog-tag: templeton
# volumes_from:
# - config_templeton_periodic
# volumes:
# - /etc/localtime:/etc/localtime
# - /etc/timezone:/etc/timezone

terrain:
image: discoenv/terrain:{{compose.de_tag}}
@@ -470,7 +470,7 @@ terrain:
- "{{terrain.port}}:60000"
log_driver: "syslog"
log_opt:
tag: terrain
syslog-tag: terrain
volumes_from:
- iplant_data_terrain
- config_terrain
@@ -489,7 +489,7 @@ tree_urls:
- "{{tree_urls.port}}:60000"
log_driver: "syslog"
log_opt:
tag: tree-urls
syslog-tag: tree-urls
volumes_from:
- config_tree_urls
volumes:
@@ -507,7 +507,7 @@ user_preferences:
- "{{user_preferences.port}}:60000"
log_driver: "syslog"
log_opt:
tag: user-preferences
syslog-tag: user-preferences
volumes_from:
- config_user_preferences
volumes:
@@ -525,7 +525,7 @@ user_sessions:
- "{{user_sessions.port}}:60000"
log_driver: "syslog"
log_opt:
tag: user-sessions
syslog-tag: user-sessions
volumes_from:
- config_user_sessions
volumes:

0 comments on commit a91aa68

Please sign in to comment.