Skip to content

Commit a36a476

Browse files
butonicbutonic
committed
commit b0f0d6a
Merge: a9422c5 5298b4b Author: Jörn Friedrich Dreyer <[email protected]> Date: Wed Sep 15 13:53:19 2021 +0200 Merge pull request #2493 from owncloud/web_not_found_redirect redirect to root when file not found
1 parent 5ec715e commit a36a476

File tree

14 files changed

+779
-779
lines changed

14 files changed

+779
-779
lines changed

‎extensions/accounts/configuration.md

+150-150
Large diffs are not rendered by default.

‎extensions/glauth/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Configuration"
3-
date: "2021-09-15T08:57:47+0000"
3+
date: "2021-09-15T11:54:21+0000"
44
weight: 20
55
geekdocRepo: https://github.com/owncloud/ocis
66
geekdocEditPath: edit/master/glauth/templates

‎extensions/graph-explorer/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Configuration"
3-
date: "2021-09-15T08:57:47+0000"
3+
date: "2021-09-15T11:54:21+0000"
44
weight: 20
55
geekdocRepo: https://github.com/owncloud/ocis
66
geekdocEditPath: edit/master/graph-explorer/templates

‎extensions/graph/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Configuration"
3-
date: "2021-09-15T08:57:47+0000"
3+
date: "2021-09-15T11:54:21+0000"
44
weight: 20
55
geekdocRepo: https://github.com/owncloud/ocis
66
geekdocEditPath: edit/master/graph/templates

‎extensions/idp/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Configuration"
3-
date: "2021-09-15T08:57:47+0000"
3+
date: "2021-09-15T11:54:21+0000"
44
weight: 20
55
geekdocRepo: https://github.com/owncloud/ocis
66
geekdocEditPath: edit/master/idp/templates

‎extensions/ocs/configuration.md

+67-67
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Configuration"
3-
date: "2021-09-15T08:57:47+0000"
3+
date: "2021-09-15T11:54:21+0000"
44
weight: 20
55
geekdocRepo: https://github.com/owncloud/ocis
66
geekdocEditPath: edit/master/ocs/templates
@@ -35,191 +35,187 @@ If multiple variables are listed for one option, they are in order of precedence
3535

3636
If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
3737

38-
### ocs server
38+
### ocs health
3939

40-
Start integrated server
40+
Check health status
4141

42-
Usage: `ocs server [command options] [arguments...]`
42+
Usage: `ocs health [command options] [arguments...]`
4343

4444

45+
-debug-addr | $OCS_DEBUG_ADDR
46+
: Address to debug endpoint. Default: `"0.0.0.0:9114"`.
4547

46-
-log-file | $OCS_LOG_FILE , $OCIS_LOG_FILE
47-
: Enable log to file.
4848

4949

50-
-log-level | $OCS_LOG_LEVEL , $OCIS_LOG_LEVEL
51-
: Set logging level.
5250

5351

54-
-log-pretty | $OCS_LOG_PRETTY , $OCIS_LOG_PRETTY
55-
: Enable pretty logging.
5652

5753

58-
-log-color | $OCS_LOG_COLOR , $OCIS_LOG_COLOR
59-
: Enable colored logging.
6054

6155

62-
-config-file | $OCS_CONFIG_FILE
63-
: Path to config file.
6456

6557

66-
-tracing-enabled | $OCS_TRACING_ENABLED , $OCIS_TRACING_ENABLED
67-
: Enable sending traces. Default: `false`.
6858

6959

70-
-tracing-type | $OCS_TRACING_TYPE , $OCIS_TRACING_TYPE
71-
: Tracing backend type. Default: `"jaeger"`.
7260

7361

74-
-tracing-endpoint | $OCS_TRACING_ENDPOINT , $OCIS_TRACING_ENDPOINT
75-
: Endpoint for the agent. Default: `""`.
7662

7763

78-
-tracing-collector | $OCS_TRACING_COLLECTOR , $OCIS_TRACING_COLLECTOR
79-
: Endpoint for the collector. Default: `""`.
8064

8165

82-
-tracing-service | $OCS_TRACING_SERVICE
83-
: Service name for tracing. Default: `"ocs"`.
8466

8567

86-
-debug-addr | $OCS_DEBUG_ADDR
87-
: Address to bind debug server. Default: `"0.0.0.0:9114"`.
8868

8969

90-
-debug-token | $OCS_DEBUG_TOKEN
91-
: Token to grant metrics access. Default: `""`.
9270

9371

94-
-debug-pprof | $OCS_DEBUG_PPROF
95-
: Enable pprof debugging.
9672

9773

98-
-debug-zpages | $OCS_DEBUG_ZPAGES
99-
: Enable zpages debugging.
74+
### ocs ocis-ocs
10075

76+
Serve OCS API for oCIS
10177

102-
-http-addr | $OCS_HTTP_ADDR
103-
: Address to bind http server. Default: `"0.0.0.0:9110"`.
78+
Usage: `ocs ocis-ocs [command options] [arguments...]`
10479

10580

106-
-http-namespace | $OCS_NAMESPACE
107-
: Set the base namespace for the http namespace. Default: `"com.owncloud.web"`.
10881

10982

110-
-name | $OCS_NAME
111-
: Service name. Default: `"ocs"`.
11283

11384

114-
-http-root | $OCS_HTTP_ROOT
115-
: Root path of http server. Default: `"/ocs"`.
11685

11786

118-
-jwt-secret | $OCS_JWT_SECRET , $OCIS_JWT_SECRET
119-
: Used to dismantle the access token, should equal reva's jwt-secret. Default: `"Pive-Fumkiu4"`.
12087

12188

122-
-account-backend-type | $OCS_ACCOUNT_BACKEND_TYPE
123-
: account-backend-type. Default: `"accounts"`.
12489

12590

126-
-reva-gateway-addr | $OCS_REVA_GATEWAY_ADDR
127-
: REVA Gateway Endpoint. Default: `"127.0.0.1:9142"`.
12891

12992

130-
-idm-address | $OCS_IDM_ADDRESS , $OCIS_URL
131-
: keeps track of the IDM Address. Needed because of Reva requisite of uniqueness for users. Default: `"https://localhost:9200"`.
13293

13394

134-
-users-driver | $OCS_STORAGE_USERS_DRIVER , $STORAGE_USERS_DRIVER
135-
: storage driver for users mount: eg. local, eos, owncloud, ocis or s3. Default: `"ocis"`.
13695

13796

138-
-extensions |
139-
: Run specific extensions during supervised mode.
14097

14198

14299

143-
### ocs version
144100

145-
Print the versions of the running instances
146101

147-
Usage: `ocs version [command options] [arguments...]`
148102

149103

150104

151105

152106

107+
### ocs server
153108

109+
Start integrated server
154110

111+
Usage: `ocs server [command options] [arguments...]`
155112

156113

157114

115+
-log-file | $OCS_LOG_FILE , $OCIS_LOG_FILE
116+
: Enable log to file.
158117

159118

119+
-log-level | $OCS_LOG_LEVEL , $OCIS_LOG_LEVEL
120+
: Set logging level.
160121

161122

123+
-log-pretty | $OCS_LOG_PRETTY , $OCIS_LOG_PRETTY
124+
: Enable pretty logging.
162125

163126

127+
-log-color | $OCS_LOG_COLOR , $OCIS_LOG_COLOR
128+
: Enable colored logging.
164129

165130

131+
-config-file | $OCS_CONFIG_FILE
132+
: Path to config file.
166133

167134

135+
-tracing-enabled | $OCS_TRACING_ENABLED , $OCIS_TRACING_ENABLED
136+
: Enable sending traces. Default: `false`.
168137

169138

139+
-tracing-type | $OCS_TRACING_TYPE , $OCIS_TRACING_TYPE
140+
: Tracing backend type. Default: `"jaeger"`.
170141

171142

143+
-tracing-endpoint | $OCS_TRACING_ENDPOINT , $OCIS_TRACING_ENDPOINT
144+
: Endpoint for the agent. Default: `""`.
172145

173146

147+
-tracing-collector | $OCS_TRACING_COLLECTOR , $OCIS_TRACING_COLLECTOR
148+
: Endpoint for the collector. Default: `""`.
174149

175-
-http-namespace | $OCS_NAMESPACE
176-
: Set the base namespace for the http namespace. Default: `"com.owncloud.web"`.
177150

151+
-tracing-service | $OCS_TRACING_SERVICE
152+
: Service name for tracing. Default: `"ocs"`.
178153

179-
-name | $OCS_NAME
180-
: Service name. Default: `"ocs"`.
181154

182-
### ocs health
155+
-debug-addr | $OCS_DEBUG_ADDR
156+
: Address to bind debug server. Default: `"0.0.0.0:9114"`.
183157

184-
Check health status
185158

186-
Usage: `ocs health [command options] [arguments...]`
159+
-debug-token | $OCS_DEBUG_TOKEN
160+
: Token to grant metrics access. Default: `""`.
187161

188162

189-
-debug-addr | $OCS_DEBUG_ADDR
190-
: Address to debug endpoint. Default: `"0.0.0.0:9114"`.
163+
-debug-pprof | $OCS_DEBUG_PPROF
164+
: Enable pprof debugging.
191165

192166

167+
-debug-zpages | $OCS_DEBUG_ZPAGES
168+
: Enable zpages debugging.
193169

194170

171+
-http-addr | $OCS_HTTP_ADDR
172+
: Address to bind http server. Default: `"0.0.0.0:9110"`.
195173

196174

175+
-http-namespace | $OCS_NAMESPACE
176+
: Set the base namespace for the http namespace. Default: `"com.owncloud.web"`.
197177

198178

179+
-name | $OCS_NAME
180+
: Service name. Default: `"ocs"`.
199181

200182

183+
-http-root | $OCS_HTTP_ROOT
184+
: Root path of http server. Default: `"/ocs"`.
201185

202186

187+
-jwt-secret | $OCS_JWT_SECRET , $OCIS_JWT_SECRET
188+
: Used to dismantle the access token, should equal reva's jwt-secret. Default: `"Pive-Fumkiu4"`.
203189

204190

191+
-account-backend-type | $OCS_ACCOUNT_BACKEND_TYPE
192+
: account-backend-type. Default: `"accounts"`.
205193

206194

195+
-reva-gateway-addr | $OCS_REVA_GATEWAY_ADDR
196+
: REVA Gateway Endpoint. Default: `"127.0.0.1:9142"`.
207197

208198

199+
-idm-address | $OCS_IDM_ADDRESS , $OCIS_URL
200+
: keeps track of the IDM Address. Needed because of Reva requisite of uniqueness for users. Default: `"https://localhost:9200"`.
209201

210202

203+
-users-driver | $OCS_STORAGE_USERS_DRIVER , $STORAGE_USERS_DRIVER
204+
: storage driver for users mount: eg. local, eos, owncloud, ocis or s3. Default: `"ocis"`.
211205

212206

207+
-extensions |
208+
: Run specific extensions during supervised mode.
213209

214210

215211

212+
### ocs version
216213

214+
Print the versions of the running instances
217215

218-
### ocs ocis-ocs
216+
Usage: `ocs version [command options] [arguments...]`
219217

220-
Serve OCS API for oCIS
221218

222-
Usage: `ocs ocis-ocs [command options] [arguments...]`
223219

224220

225221

@@ -245,6 +241,10 @@ Usage: `ocs ocis-ocs [command options] [arguments...]`
245241

246242

247243

244+
-http-namespace | $OCS_NAMESPACE
245+
: Set the base namespace for the http namespace. Default: `"com.owncloud.web"`.
248246

249247

248+
-name | $OCS_NAME
249+
: Service name. Default: `"ocs"`.
250250

‎extensions/proxy/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Configuration"
3-
date: "2021-09-15T08:57:47+0000"
3+
date: "2021-09-15T11:54:21+0000"
44
weight: 20
55
geekdocRepo: https://github.com/owncloud/ocis
66
geekdocEditPath: edit/master/proxy/templates

0 commit comments

Comments
 (0)