projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15370-loopback-dispatchcloud'
[arvados.git]
/
lib
/
install
/
init.go
diff --git
a/lib/install/init.go
b/lib/install/init.go
index 126892bc3e3baf1d219a44a7c3894b9fc91b3fc1..d2fed1dd7ad4fee9fac408da3e2070c913174b19 100644
(file)
--- a/
lib/install/init.go
+++ b/
lib/install/init.go
@@
-106,53
+106,53
@@
func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
Services:
Controller:
InternalURLs:
Services:
Controller:
InternalURLs:
- "http://0.0.0.0:
8003
/": {}
- ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
3
0/" ) }}
+ "http://0.0.0.0:
9000
/": {}
+ ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
4
0/" ) }}
RailsAPI:
InternalURLs:
RailsAPI:
InternalURLs:
- "http://0.0.0.0:
8004
/": {}
+ "http://0.0.0.0:
9001
/": {}
Websocket:
InternalURLs:
Websocket:
InternalURLs:
- "http://0.0.0.0:
8005
/": {}
- ExternalURL: {{printf "%q" ( print "wss://" .Domain ":44
35
/websocket" ) }}
+ "http://0.0.0.0:
9004
/": {}
+ ExternalURL: {{printf "%q" ( print "wss://" .Domain ":44
44
/websocket" ) }}
Keepbalance:
InternalURLs:
Keepbalance:
InternalURLs:
- "http://0.0.0.0:90
05
/": {}
+ "http://0.0.0.0:90
19
/": {}
GitHTTP:
InternalURLs:
GitHTTP:
InternalURLs:
- "http://0.0.0.0:900
1
/": {}
- ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
36
/" ) }}
+ "http://0.0.0.0:900
5
/": {}
+ ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
45
/" ) }}
DispatchCloud:
InternalURLs:
"http://0.0.0.0:9006/": {}
Keepproxy:
InternalURLs:
DispatchCloud:
InternalURLs:
"http://0.0.0.0:9006/": {}
Keepproxy:
InternalURLs:
- "http://0.0.0.0:
25108
/": {}
- ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
3
7/" ) }}
+ "http://0.0.0.0:
9007
/": {}
+ ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
4
7/" ) }}
WebDAV:
InternalURLs:
WebDAV:
InternalURLs:
- "http://0.0.0.0:900
2
/": {}
- ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
3
8/" ) }}
+ "http://0.0.0.0:900
8
/": {}
+ ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
4
8/" ) }}
WebDAVDownload:
InternalURLs:
WebDAVDownload:
InternalURLs:
- "http://0.0.0.0:
8004
/": {}
- ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
3
9/" ) }}
+ "http://0.0.0.0:
9009
/": {}
+ ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
4
9/" ) }}
Keepstore:
InternalURLs:
Keepstore:
InternalURLs:
- "http://0.0.0.0:
25107
/": {}
+ "http://0.0.0.0:
9010
/": {}
Composer:
Composer:
- ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
40
/composer" ) }}
+ ExternalURL: {{printf "%q" ( print "https://" .Domain ":44
59
/composer" ) }}
Workbench1:
InternalURLs:
Workbench1:
InternalURLs:
- "http://0.0.0.0:
8001
/": {}
- ExternalURL: {{printf "%q" ( print "https://" .Domain ":444
1
/" ) }}
+ "http://0.0.0.0:
9002
/": {}
+ ExternalURL: {{printf "%q" ( print "https://" .Domain ":444
2
/" ) }}
Workbench2:
InternalURLs:
Workbench2:
InternalURLs:
- "http://0.0.0.0:
8002
/": {}
- ExternalURL: {{printf "%q" ( print "https://" .Domain "
:4442
/" ) }}
+ "http://0.0.0.0:
9003
/": {}
+ ExternalURL: {{printf "%q" ( print "https://" .Domain "/" ) }}
Health:
InternalURLs:
Health:
InternalURLs:
- "http://0.0.0.0:90
07
/": {}
+ "http://0.0.0.0:90
11
/": {}
Collections:
BlobSigningKey: {{printf "%q" ( .RandomHex 50 )}}
{{if .Insecure}}
Collections:
BlobSigningKey: {{printf "%q" ( .RandomHex 50 )}}
{{if .Insecure}}
@@
-160,6
+160,9
@@
func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
{{end}}
Containers:
DispatchPrivateKey: {{printf "%q" .GenerateSSHPrivateKey}}
{{end}}
Containers:
DispatchPrivateKey: {{printf "%q" .GenerateSSHPrivateKey}}
+ CloudVMs:
+ Enable: true
+ Driver: loopback
ManagementToken: {{printf "%q" ( .RandomHex 50 )}}
PostgreSQL:
Connection:
ManagementToken: {{printf "%q" ( .RandomHex 50 )}}
PostgreSQL:
Connection: