projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18791: allow single-host-single-hostname to manage LE certs
[arvados.git]
/
tools
/
salt-install
/
config_examples
/
single_host
/
single_hostname
/
pillars
/
arvados.sls
diff --git
a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
index a45ac8d8118c5a307d85c1f9331d66ec4efd1bd9..334edb946b28880336bf85683fc30a45eef815a1 100644
(file)
--- a/
tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
+++ b/
tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
@@
-68,11
+68,12
@@
arvados:
password: "__DATABASE_PASSWORD__"
user: __CLUSTER___arvados
encoding: en_US.utf8
password: "__DATABASE_PASSWORD__"
user: __CLUSTER___arvados
encoding: en_US.utf8
+ client_encoding: UTF8
tls:
# certificate: ''
# key: ''
tls:
# certificate: ''
# key: ''
- #
required to test with arvados-snakeoil certs
+ #
When using arvados-snakeoil certs set insecure: true
insecure: true
### TOKENS
insecure: true
### TOKENS
@@
-80,7
+81,6
@@
arvados:
system_root: __SYSTEM_ROOT_TOKEN__
management: __MANAGEMENT_TOKEN__
anonymous_user: __ANONYMOUS_USER_TOKEN__
system_root: __SYSTEM_ROOT_TOKEN__
management: __MANAGEMENT_TOKEN__
anonymous_user: __ANONYMOUS_USER_TOKEN__
- rails_secret: YDLxHf4GqqmLXYAMgndrAmFEdqgC0sBqX7TEjMN2rw9D6EVwgx
### KEYS
secrets:
### KEYS
secrets:
@@
-102,7
+102,7
@@
arvados:
# <cluster>-nyw5e-<volume>
__CLUSTER__-nyw5e-000000000000000:
AccessViaHosts:
# <cluster>-nyw5e-<volume>
__CLUSTER__-nyw5e-000000000000000:
AccessViaHosts:
- 'http://__
HOSTNAME
_INT__:25107':
+ 'http://__
IP
_INT__:25107':
ReadOnly: false
Replication: 2
Driver: Directory
ReadOnly: false
Replication: 2
Driver: Directory
@@
-119,21
+119,21
@@
arvados:
Controller:
ExternalURL: 'https://__HOSTNAME_EXT__:__CONTROLLER_EXT_SSL_PORT__'
InternalURLs:
Controller:
ExternalURL: 'https://__HOSTNAME_EXT__:__CONTROLLER_EXT_SSL_PORT__'
InternalURLs:
- 'http://__
HOSTNAME
_INT__:8003': {}
+ 'http://__
IP
_INT__:8003': {}
Keepproxy:
ExternalURL: 'https://__HOSTNAME_EXT__:__KEEP_EXT_SSL_PORT__'
InternalURLs:
Keepproxy:
ExternalURL: 'https://__HOSTNAME_EXT__:__KEEP_EXT_SSL_PORT__'
InternalURLs:
- 'http://__
HOSTNAME
_INT__:25100': {}
+ 'http://__
IP
_INT__:25100': {}
Keepstore:
InternalURLs:
Keepstore:
InternalURLs:
- 'http://__
HOSTNAME
_INT__:25107': {}
+ 'http://__
IP
_INT__:25107': {}
RailsAPI:
InternalURLs:
RailsAPI:
InternalURLs:
- 'http://__
HOSTNAME
_INT__:8004': {}
+ 'http://__
IP
_INT__:8004': {}
WebDAV:
ExternalURL: 'https://__HOSTNAME_EXT__:__KEEPWEB_EXT_SSL_PORT__'
InternalURLs:
WebDAV:
ExternalURL: 'https://__HOSTNAME_EXT__:__KEEPWEB_EXT_SSL_PORT__'
InternalURLs:
- 'http://__
HOSTNAME
_INT__:9003': {}
+ 'http://__
IP
_INT__:9003': {}
WebDAVDownload:
ExternalURL: 'https://__HOSTNAME_EXT__:__KEEPWEB_EXT_SSL_PORT__'
WebShell:
WebDAVDownload:
ExternalURL: 'https://__HOSTNAME_EXT__:__KEEPWEB_EXT_SSL_PORT__'
WebShell:
@@
-141,7
+141,7
@@
arvados:
Websocket:
ExternalURL: 'wss://__HOSTNAME_EXT__:__WEBSOCKET_EXT_SSL_PORT__/websocket'
InternalURLs:
Websocket:
ExternalURL: 'wss://__HOSTNAME_EXT__:__WEBSOCKET_EXT_SSL_PORT__/websocket'
InternalURLs:
- 'http://__
HOSTNAME
_INT__:8005': {}
+ 'http://__
IP
_INT__:8005': {}
Workbench1:
ExternalURL: 'https://__HOSTNAME_EXT__:__WORKBENCH1_EXT_SSL_PORT__'
Workbench2:
Workbench1:
ExternalURL: 'https://__HOSTNAME_EXT__:__WORKBENCH1_EXT_SSL_PORT__'
Workbench2: