Merge pull request #261 from owncloud/point-frontend-to-proxy
Point frontend to proxy
This commit is contained in:
Vincent Petry
+28
-22
@@ -1,7 +1,7 @@
|
||||
def main(ctx):
|
||||
before = [
|
||||
testing(ctx),
|
||||
apiTests(ctx, 'master', '31dbb9ce87de35165edf85ce9eda8f004c73f9f8'),
|
||||
apiTests(ctx, 'master', 'ad274cb7f2a20ffba7fb9c65726ae9ef9270e4c0'),
|
||||
]
|
||||
|
||||
stages = [
|
||||
@@ -65,21 +65,24 @@ def apiTests(ctx, coreBranch = 'master', coreCommit = ''):
|
||||
'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://reva-server:9164/data',
|
||||
'REVA_STORAGE_OC_DATA_URL': 'reva-server:9164',
|
||||
'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
|
||||
'REVA_SHARING_USER_JSON_FILE': '/srv/app/tmp/reva/shares.json'
|
||||
'REVA_SHARING_USER_JSON_FILE': '/srv/app/tmp/reva/shares.json',
|
||||
'REVA_FRONTEND_URL': 'http://reva-server:9140',
|
||||
'REVA_DATAGATEWAY_URL': 'http://reva-server:9140/data',
|
||||
},
|
||||
'commands': [
|
||||
'apk add mailcap',
|
||||
'mkdir -p /srv/app/tmp/reva',
|
||||
'bin/ocis-reva gateway &',
|
||||
'bin/ocis-reva users &',
|
||||
'bin/ocis-reva auth-basic &',
|
||||
'bin/ocis-reva auth-bearer &',
|
||||
'bin/ocis-reva sharing &',
|
||||
'bin/ocis-reva storage-home &',
|
||||
'bin/ocis-reva storage-home-data &',
|
||||
'bin/ocis-reva storage-oc &',
|
||||
'bin/ocis-reva storage-oc-data &',
|
||||
'bin/ocis-reva frontend'
|
||||
'bin/ocis-reva --log-level debug --log-pretty gateway &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty users &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty auth-basic &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty auth-bearer &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty sharing &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty storage-home &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty storage-home-data &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty storage-oc &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty storage-oc-data &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty frontend &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty reva-storage-public-link'
|
||||
],
|
||||
'volumes': [
|
||||
{
|
||||
@@ -279,19 +282,22 @@ def testing(ctx):
|
||||
'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
|
||||
'REVA_SHARING_USER_JSON_FILE': '/srv/app/tmp/reva/shares.json',
|
||||
'REVA_OIDC_ISSUER': 'https://konnectd:9130',
|
||||
'REVA_FRONTEND_URL': 'http://reva-server:9140',
|
||||
'REVA_DATAGATEWAY_URL': 'http://reva-server:9140/data',
|
||||
},
|
||||
'commands': [
|
||||
'mkdir -p /srv/app/tmp/reva',
|
||||
'bin/ocis-reva gateway &',
|
||||
'bin/ocis-reva users &',
|
||||
'bin/ocis-reva auth-basic &',
|
||||
'bin/ocis-reva auth-bearer &',
|
||||
'bin/ocis-reva sharing &',
|
||||
'bin/ocis-reva storage-home &',
|
||||
'bin/ocis-reva storage-home-data &',
|
||||
'bin/ocis-reva storage-oc &',
|
||||
'bin/ocis-reva storage-oc-data &',
|
||||
'bin/ocis-reva frontend'
|
||||
'bin/ocis-reva --log-level debug --log-pretty gateway &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty users &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty auth-basic &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty auth-bearer &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty sharing &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty storage-home &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty storage-home-data &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty storage-oc &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty storage-oc-data &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty frontend &',
|
||||
'bin/ocis-reva --log-level debug --log-pretty reva-storage-public-link'
|
||||
],
|
||||
'volumes': [
|
||||
{
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
Enhancement: update reva to v0.1.1-0.20200625112940-6a2822cb3f15
|
||||
|
||||
- Updated reva to v0.1.1-0.20200625112940-6a2822cb3f15 (#261)
|
||||
- TUS upload support through datagateway (#261, reva/#878, reva/#888)
|
||||
- Added support for differing metrics path for Prometheus to Mentix (reva/#875)
|
||||
- More data exported by Mentix (reva/#881)
|
||||
- Implementation of file operations in public folder shares (#49, #293, reva/#877)
|
||||
- Make httpclient trust local certificates for now (reva/#880)
|
||||
|
||||
https://github.com/owncloud/ocis-reva/pull/261
|
||||
https://github.com/cs3org/reva/pull/875
|
||||
https://github.com/owncloud/ocis-reva/issues/49
|
||||
https://github.com/owncloud/ocis-reva/issues/293
|
||||
https://github.com/cs3org/reva/pull/877
|
||||
https://github.com/owncloud/ocis-reva/issues/261
|
||||
https://github.com/cs3org/reva/pull/878
|
||||
https://github.com/cs3org/reva/pull/881
|
||||
https://github.com/cs3org/reva/pull/880
|
||||
https://github.com/cs3org/reva/pull/888
|
||||
+884
-881
File diff suppressed because it is too large
Load Diff
@@ -3,7 +3,7 @@ module github.com/owncloud/ocis-reva
|
||||
go 1.13
|
||||
|
||||
require (
|
||||
github.com/cs3org/reva v0.1.1-0.20200624063447-db5e6635d5f0
|
||||
github.com/cs3org/reva v0.1.1-0.20200626083045-8d345749ae0d
|
||||
github.com/gofrs/uuid v3.3.0+incompatible
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
|
||||
github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 // indirect
|
||||
|
||||
@@ -17,6 +17,7 @@ contrib.go.opencensus.io/exporter/jaeger v0.2.0/go.mod h1:ukdzwIYYHgZ7QYtwVFQUji
|
||||
contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
|
||||
contrib.go.opencensus.io/exporter/prometheus v0.1.0 h1:SByaIoWwNgMdPSgl5sMqM2KDE5H/ukPWBRo314xiDvg=
|
||||
contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A=
|
||||
contrib.go.opencensus.io/exporter/prometheus v0.2.0 h1:9PUk0/8V0LGoPqVCrf8fQZJkFGBxudu8jOjQSMwoD6w=
|
||||
contrib.go.opencensus.io/exporter/prometheus v0.2.0/go.mod h1:TYmVAyE8Tn1lyPcltF5IYYfWp2KHu7lQGIZnj8iZMys=
|
||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
||||
github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
|
||||
@@ -63,8 +64,10 @@ github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.0/go.mod h1:zpDJeKyp9ScW4NNrbd
|
||||
github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE=
|
||||
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E=
|
||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ=
|
||||
github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
|
||||
@@ -83,10 +86,15 @@ github.com/aws/aws-sdk-go v1.23.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
|
||||
github.com/aws/aws-sdk-go v1.31.1 h1:5tv3VtTS/IM1yZ6lxMQQVmH28SkkR3b3w+6u+9rcLx4=
|
||||
github.com/aws/aws-sdk-go v1.31.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-sdk-go v1.31.7 h1:TCA+pXKvzDMA3vVqhK21cCy5GarC8pTQb/DrVOWI3iY=
|
||||
github.com/aws/aws-sdk-go v1.31.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-sdk-go v1.32.3/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-sdk-go v1.32.5/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-sdk-go v1.32.8/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-sdk-go v1.32.9 h1:ai+NZsCV+Z97+jqIKya49gbCObOay9FKww0/VCNuXug=
|
||||
github.com/aws/aws-sdk-go v1.32.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-sdk-go v1.32.10 h1:cEJTxGcBGlsM2tN36MZQKhlK93O9HrnaRs+lq2f0zN8=
|
||||
github.com/aws/aws-sdk-go v1.32.10/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04=
|
||||
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
|
||||
github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
|
||||
@@ -157,6 +165,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20200423154403-462ce7762d4a/go.mod h1:UXha4T
|
||||
github.com/cs3org/go-cs3apis v0.0.0-20200515145316-7048e6a5a73d h1:toZvBLH1cbHT65kv6xYPd9QqwLUHwOAVHqe9j4obAq4=
|
||||
github.com/cs3org/go-cs3apis v0.0.0-20200515145316-7048e6a5a73d/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
|
||||
github.com/cs3org/go-cs3apis v0.0.0-20200622121618-dc54dffb5e44/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
|
||||
github.com/cs3org/go-cs3apis v0.0.0-20200625121012-96e791152b14 h1:ORPIrxw/T33ALlpaon9IMRzf54ArJQWCYlcECZiRmEc=
|
||||
github.com/cs3org/go-cs3apis v0.0.0-20200625121012-96e791152b14/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
|
||||
github.com/cs3org/reva v0.1.1-0.20200520150229-ce94fda7436f/go.mod h1:fVZ7IXTQaxNit5Q9yA+x6ciJmUpEHgBrxtwmiGGBY40=
|
||||
github.com/cs3org/reva v0.1.1-0.20200528123359-7d74bf8e9928 h1:6dIWlFuZNGz3tmK8IF/1JQ/TkmTj0/v3dSt0Zi1zrX0=
|
||||
github.com/cs3org/reva v0.1.1-0.20200528123359-7d74bf8e9928/go.mod h1:ig/TuMCG/l6vjOvFkj/4tU27PBvcig+Kfjc4mF++BwQ=
|
||||
@@ -176,6 +186,12 @@ github.com/cs3org/reva v0.1.1-0.20200622084157-4925dc73ec86 h1:TSG6ZPczyWmyFl74v
|
||||
github.com/cs3org/reva v0.1.1-0.20200622084157-4925dc73ec86/go.mod h1:tFcYbIPMOKMITn2b7j4i4oNoiakNXkCD8Bx6pwf7N/U=
|
||||
github.com/cs3org/reva v0.1.1-0.20200624063447-db5e6635d5f0 h1:zzwEoAxYKhEbWzfaa43Va1pO4OSXWiS+1P/CsLn2als=
|
||||
github.com/cs3org/reva v0.1.1-0.20200624063447-db5e6635d5f0/go.mod h1:AwSrblO/VrqvX1M+y+p0+4rSUAO0/PGVA1FR0GKYANs=
|
||||
github.com/cs3org/reva v0.1.1-0.20200625112940-6a2822cb3f15 h1:ND/a8QsIUhL12gZerFMv/YnoWhpt23xW3ExxfT2oHP0=
|
||||
github.com/cs3org/reva v0.1.1-0.20200625112940-6a2822cb3f15/go.mod h1:7i7pnpPAO0eKy/9+az2YndOVFub0gZCDenpU6EyZqJI=
|
||||
github.com/cs3org/reva v0.1.1-0.20200625144447-03e6aba90379 h1:IvAcfPZ7Ii9KAPBGLTIxXuN6qqJSZWRIlYiErThobzM=
|
||||
github.com/cs3org/reva v0.1.1-0.20200625144447-03e6aba90379/go.mod h1:qmaOljVCmm3kcRS8RW5E34Voly4dDCFdlllj/j4KW/0=
|
||||
github.com/cs3org/reva v0.1.1-0.20200626083045-8d345749ae0d h1:SCUMOhkYTEjFA7IsMlj49bF+cCgTEbfnBme0VFqOhuc=
|
||||
github.com/cs3org/reva v0.1.1-0.20200626083045-8d345749ae0d/go.mod h1:wunIwvRI7Pd+QFB0YCK+jdAtq0udQzjt8iG7WQ+LLrs=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
@@ -501,6 +517,7 @@ github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FK
|
||||
github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
|
||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
|
||||
github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
|
||||
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
|
||||
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
|
||||
@@ -649,7 +666,9 @@ github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
|
||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||
github.com/mitchellh/mapstructure v1.3.0 h1:iDwIio/3gk2QtLLEsqU5lInaMzos0hDTz8a6lazSFVw=
|
||||
github.com/mitchellh/mapstructure v1.3.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/mitchellh/mapstructure v1.3.1 h1:cCBH2gTD2K0OtLlv/Y5H01VQCqmlDxz30kS5Y5bqfLA=
|
||||
github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
|
||||
github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
|
||||
github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
|
||||
@@ -711,8 +730,10 @@ github.com/ory/fosite v0.29.0/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S
|
||||
github.com/ory/fosite v0.31.0/go.mod h1:lSSqjo8Kr/U1P3kJWxsNGHmq7TnH/7pS1ijvQRT7G+g=
|
||||
github.com/ory/fosite v0.31.3 h1:5WjLwfs+yUALZjzKUKGN/M+ddBJ5Ol6NawxuCO2TuAg=
|
||||
github.com/ory/fosite v0.31.3/go.mod h1:UeBhRgW6nAjTcd8S7kAo0IFsY/rTPyOXPq/t8N20Q8I=
|
||||
github.com/ory/fosite v0.32.0 h1:g89HkBt0dgm+HPrbsYZTmyks1NIw0BH/UlEaw84e1ss=
|
||||
github.com/ory/fosite v0.32.0/go.mod h1:UeBhRgW6nAjTcd8S7kAo0IFsY/rTPyOXPq/t8N20Q8I=
|
||||
github.com/ory/fosite v0.32.1/go.mod h1:UeBhRgW6nAjTcd8S7kAo0IFsY/rTPyOXPq/t8N20Q8I=
|
||||
github.com/ory/fosite v0.32.2 h1:iRV495P/9EyoYQ8qEHYxFQeeYCdDFawqjAML+qiMF9s=
|
||||
github.com/ory/fosite v0.32.2/go.mod h1:UeBhRgW6nAjTcd8S7kAo0IFsY/rTPyOXPq/t8N20Q8I=
|
||||
github.com/ory/go-acc v0.0.0-20181118080137-ddc355013f90/go.mod h1:sxnvPCxChFuSmTJGj8FdMupeq1BezCiEpDjTUXQ4hf4=
|
||||
github.com/ory/go-acc v0.2.1 h1:Pwcmwd/cSnwJsYN76+w3HU7oXeWFTkwj/KUj1qGDrVw=
|
||||
@@ -783,6 +804,7 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
|
||||
github.com/prometheus/procfs v0.0.6/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
|
||||
github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8=
|
||||
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
|
||||
github.com/prometheus/statsd_exporter v0.15.0 h1:UiwC1L5HkxEPeapXdm2Ye0u1vUJfTj7uwT5yydYpa1E=
|
||||
github.com/prometheus/statsd_exporter v0.15.0/go.mod h1:Dv8HnkoLQkeEjkIE4/2ndAA7WL1zHKK7WMqFQqu72rw=
|
||||
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
|
||||
github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA=
|
||||
@@ -801,6 +823,7 @@ github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
|
||||
github.com/rs/zerolog v1.17.2/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I=
|
||||
github.com/rs/zerolog v1.18.0 h1:CbAm3kP2Tptby1i9sYy2MGRg0uxIN9cyDb59Ys7W8z8=
|
||||
github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I=
|
||||
github.com/rs/zerolog v1.19.0 h1:hYz4ZVdUgjXTBUmrkrw55j1nHx68LfOKIQk5IYtyScg=
|
||||
github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=
|
||||
github.com/rubenv/sql-migrate v0.0.0-20190212093014-1007f53448d7/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=
|
||||
github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
|
||||
@@ -928,6 +951,7 @@ go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
|
||||
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
|
||||
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
|
||||
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
|
||||
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
|
||||
@@ -1214,6 +1238,7 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
|
||||
google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
|
||||
google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
|
||||
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
|
||||
google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE=
|
||||
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
|
||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||
@@ -1224,6 +1249,7 @@ google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyz
|
||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
gopkg.in/Acconut/lockfile.v1 v1.1.0/go.mod h1:6UCz3wJ8tSFUsPR6uP/j8uegEtDuEEqFxlpi0JI4Umw=
|
||||
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
||||
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
|
||||
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
|
||||
|
||||
+12
-1
@@ -6,6 +6,7 @@ import (
|
||||
"os"
|
||||
"os/signal"
|
||||
"path"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/cs3org/reva/cmd/revad/runtime"
|
||||
@@ -132,7 +133,7 @@ func Frontend(cfg *config.Config) *cli.Command {
|
||||
"config": map[string]interface{}{
|
||||
"version": "1.8",
|
||||
"website": "reva",
|
||||
"host": "http://" + cfg.Reva.Frontend.URL, // TODO URLs should include the protocol
|
||||
"host": urlWithScheme(cfg.Reva.Frontend.URL),
|
||||
"contact": "admin@localhost",
|
||||
"ssl": "false",
|
||||
},
|
||||
@@ -290,3 +291,13 @@ func Frontend(cfg *config.Config) *cli.Command {
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// urlWithScheme checks if the given string is prefixed with "http". If it is not, "http://" will be added as prefix.
|
||||
// As we can't tell if http or https should be the preferred scheme, the correct approach would be to fail on urls
|
||||
// without scheme. As long as we have default urls in our flagsets which don't have a scheme, this is a feasible workaround.
|
||||
func urlWithScheme(str string) string {
|
||||
if !strings.HasPrefix(str, "http") {
|
||||
str = "http://" + str
|
||||
}
|
||||
return str
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ func Gateway(cfg *config.Config) *cli.Command {
|
||||
"link_grants_file": cfg.Reva.Gateway.LinkGrants,
|
||||
// other
|
||||
"disable_home_creation_on_login": cfg.Reva.Gateway.DisableHomeCreationOnLogin,
|
||||
"datagateway": cfg.Reva.Frontend.URL,
|
||||
"datagateway": urlWithScheme(cfg.Reva.DataGateway.URL),
|
||||
"transfer_shared_secret": cfg.Reva.TransferSecret,
|
||||
"transfer_expires": cfg.Reva.TransferExpires,
|
||||
},
|
||||
|
||||
@@ -229,8 +229,9 @@ type Reva struct {
|
||||
LDAP LDAP
|
||||
OCDav OCDav
|
||||
Storages StorageConfig
|
||||
// Ports are used configure which services to start on which port
|
||||
// Ports are used to configure which services to start on which port
|
||||
Frontend Port
|
||||
DataGateway Port
|
||||
Gateway Gateway
|
||||
Users Users
|
||||
AuthBasic Port
|
||||
|
||||
@@ -136,7 +136,7 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
|
||||
},
|
||||
&cli.StringFlag{
|
||||
Name: "url",
|
||||
Value: "localhost:9140",
|
||||
Value: "https://localhost:9200",
|
||||
Usage: "URL to use for the reva service",
|
||||
EnvVars: []string{"REVA_FRONTEND_URL"},
|
||||
Destination: &cfg.Reva.Frontend.URL,
|
||||
|
||||
@@ -188,11 +188,18 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag {
|
||||
|
||||
&cli.StringFlag{
|
||||
Name: "frontend-url",
|
||||
Value: "localhost:9140",
|
||||
Value: "https://localhost:9200",
|
||||
Usage: "URL to use for the reva service",
|
||||
EnvVars: []string{"REVA_FRONTEND_URL"},
|
||||
Destination: &cfg.Reva.Frontend.URL,
|
||||
},
|
||||
&cli.StringFlag{
|
||||
Name: "datagateway-url",
|
||||
Value: "https://localhost:9200/data",
|
||||
Usage: "URL to use for the reva datagateway",
|
||||
EnvVars: []string{"REVA_DATAGATEWAY_URL"},
|
||||
Destination: &cfg.Reva.DataGateway.URL,
|
||||
},
|
||||
&cli.StringFlag{
|
||||
Name: "users-url",
|
||||
Value: "localhost:9144",
|
||||
|
||||
@@ -146,7 +146,7 @@ func StorageEOSWithConfig(cfg *config.Config) []cli.Flag {
|
||||
},
|
||||
&cli.BoolFlag{
|
||||
Name: "expose-data-server",
|
||||
Value: true,
|
||||
Value: false,
|
||||
Usage: "exposes a dedicated data server",
|
||||
EnvVars: []string{"REVA_STORAGE_EOS_EXPOSE_DATA_SERVER"},
|
||||
Destination: &cfg.Reva.StorageEOS.ExposeDataServer,
|
||||
|
||||
@@ -148,7 +148,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag {
|
||||
},
|
||||
&cli.BoolFlag{
|
||||
Name: "expose-data-server",
|
||||
Value: true,
|
||||
Value: false,
|
||||
Usage: "exposes a dedicated data server",
|
||||
EnvVars: []string{"REVA_STORAGE_HOME_EXPOSE_DATA_SERVER"},
|
||||
Destination: &cfg.Reva.StorageHome.ExposeDataServer,
|
||||
|
||||
@@ -146,7 +146,7 @@ func StorageOCWithConfig(cfg *config.Config) []cli.Flag {
|
||||
},
|
||||
&cli.BoolFlag{
|
||||
Name: "expose-data-server",
|
||||
Value: true,
|
||||
Value: false,
|
||||
Usage: "exposes a dedicated data server",
|
||||
EnvVars: []string{"REVA_STORAGE_OC_EXPOSE_DATA_SERVER"},
|
||||
Destination: &cfg.Reva.StorageOC.ExposeDataServer,
|
||||
|
||||
@@ -140,7 +140,7 @@ func StoragePublicLink(cfg *config.Config) []cli.Flag {
|
||||
},
|
||||
&cli.BoolFlag{
|
||||
Name: "expose-data-server",
|
||||
Value: true,
|
||||
Value: false,
|
||||
Usage: "exposes a dedicated data server",
|
||||
EnvVars: []string{"REVA_STORAGE_PUBLIC_LINK_EXPOSE_DATA_SERVER"},
|
||||
Destination: &cfg.Reva.StoragePublicLink.ExposeDataServer,
|
||||
|
||||
Reference in New Issue
Block a user