diff --git a/accounts/Makefile b/accounts/Makefile index ee90973fb..e24072510 100644 --- a/accounts/Makefile +++ b/accounts/Makefile @@ -135,6 +135,10 @@ release-check: .PHONY: release-finish release-finish: release-copy release-check +.PHONY: config-docs-generate +config-docs-generate: +# go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md + .PHONY: test-acceptance-webui test-acceptance-webui: ./ui/tests/run-acceptance-test.sh $(FEATURE_PATH) diff --git a/docs/extensions/konnectd/configuration.md b/docs/extensions/konnectd/configuration.md index 281b64fde..0eb5e9886 100644 --- a/docs/extensions/konnectd/configuration.md +++ b/docs/extensions/konnectd/configuration.md @@ -1,6 +1,6 @@ --- title: "Configuration" -date: "2020-09-21T13:14:47+0200" +date: "2020-09-30T17:30:16+0200" weight: 20 geekdocRepo: https://github.com/owncloud/ocis-konnectd geekdocEditPath: edit/master/docs @@ -108,6 +108,9 @@ Usage: `ocis-konnectd server [command options] [arguments...]` --http-namespace | $KONNECTD_HTTP_NAMESPACE : Set the base namespace for service discovery. Default: `com.owncloud.web`. +--name | $KONNECTD_NAME +: Service name. Default: `konnectd`. + --identity-manager | $KONNECTD_IDENTITY_MANAGER : Identity manager (one of ldap,kc,cookie,dummy). Default: `ldap`. @@ -174,3 +177,15 @@ Usage: `ocis-konnectd server [command options] [arguments...]` --disable-identifier-webapp | $KONNECTD_DISABLE_IDENTIFIER_WEBAPP : Disable built-in identifier-webapp to use a frontend hosted elsewhere.. Default: `true`. +### ocis-konnectd version + +Print the versions of the running instances + +Usage: `ocis-konnectd version [command options] [arguments...]` + +--http-namespace | $KONNECTD_HTTP_NAMESPACE +: Set the base namespace for service discovery. Default: `com.owncloud.web`. + +--name | $KONNECTD_NAME +: Service name. Default: `konnectd`. + diff --git a/docs/ocis/configuration.md b/docs/ocis/configuration.md index 807f92149..3876e1220 100644 --- a/docs/ocis/configuration.md +++ b/docs/ocis/configuration.md @@ -1,6 +1,6 @@ --- title: "Configuration" -date: "2020-09-21T13:14:56+0200" +date: "2020-09-30T17:35:29+0200" weight: 20 geekdocRepo: https://github.com/owncloud/ocis geekdocEditPath: edit/master/docs @@ -57,15 +57,6 @@ Usage: `ocis [global options] command [command options] [arguments...]` ## Sub Commands -### ocis health - -Check health status - -Usage: `ocis health [command options] [arguments...]` - ---debug-addr | $OCIS_DEBUG_ADDR -: Address to debug endpoint. Default: `0.0.0.0:9010`. - ### ocis server Start fullstack server @@ -108,109 +99,82 @@ Usage: `ocis server [command options] [arguments...]` --grpc-addr | $OCIS_GRPC_ADDR : Address to bind grpc server. Default: `0.0.0.0:9001`. +### ocis health + +Check health status + +Usage: `ocis health [command options] [arguments...]` + +--debug-addr | $OCIS_DEBUG_ADDR +: Address to debug endpoint. Default: `0.0.0.0:9010`. + ### List of available Extension subcommands There are more subcommands to start the individual extensions. Please check the documentation about their usage and options in the dedicated section of the documentation. -#### ocis konnectd - -Start konnectd server - -#### ocis run - -Runs an extension - -#### ocis store - -Start a go-micro store - -#### ocis glauth - -Start glauth server - -#### ocis ocs - -Start ocs server - -#### ocis reva-storage-eos-data - -Start reva storage data provider for eos mount - -#### ocis reva-storage-home-data - -Start reva storage data provider for home mount - -#### ocis kill - -Kill an extension by name - -#### ocis proxy - -Start proxy server - -#### ocis reva-auth-bearer - -Start reva auth-bearer service - -#### ocis reva-storage-oc-data - -Start reva storage data provider for oc mount - -#### ocis settings - -Start settings server - -#### ocis accounts - -Start accounts server - -#### ocis phoenix - -Start phoenix server - -#### ocis reva-storage-eos - -Start reva storage service for eos mount - -#### ocis reva-storage-home - -Start reva storage service for home mount - -#### ocis reva-storage-oc - -Start reva storage service for oc mount - -#### ocis reva-storage-root - -Start reva root storage - -#### ocis reva-gateway - -Start reva gateway - -#### ocis reva-sharing - -Start reva sharing service - -#### ocis reva-users - -Start reva users service - #### ocis list Lists running ocis extensions -#### ocis reva-auth-basic +#### ocis phoenix -Start reva auth-basic service +Start phoenix server + +#### ocis reva-gateway + +Start reva gateway + +#### ocis reva-storage-public-link + +Start reva public link storage + +#### ocis kill + +Kill an extension by name + +#### ocis ocs + +Start ocs server #### ocis reva-frontend Start reva frontend -#### ocis reva-storage-public-link +#### ocis reva-storage-eos-data -Start reva public link storage +Start reva storage data provider for eos mount + +#### ocis glauth + +Start glauth server + +#### ocis reva-storage-eos + +Start reva storage service for eos mount + +#### ocis reva-users + +Start reva users service + +#### ocis konnectd + +Start konnectd server + +#### ocis reva-storage-home-data + +Start reva storage data provider for home mount + +#### ocis reva-storage-root + +Start reva root storage + +#### ocis run + +Runs an extension + +#### ocis settings + +Start settings server #### ocis thumbnails @@ -220,3 +184,39 @@ Start thumbnails server Start webdav server +#### ocis reva-auth-basic + +Start reva auth-basic service + +#### ocis accounts + +Start accounts server + +#### ocis proxy + +Start proxy server + +#### ocis store + +Start a go-micro store + +#### ocis reva-auth-bearer + +Start reva auth-bearer service + +#### ocis reva-sharing + +Start reva sharing service + +#### ocis reva-storage-home + +Start reva storage service for home mount + +#### ocis reva-storage-oc + +Start reva storage service for oc mount + +#### ocis reva-storage-oc-data + +Start reva storage data provider for oc mount + diff --git a/glauth/Makefile b/glauth/Makefile index 3205d14dc..4d2116740 100644 --- a/glauth/Makefile +++ b/glauth/Makefile @@ -3,7 +3,6 @@ NAME := glauth IMPORT := github.com/owncloud/ocis/$(NAME) BIN := bin DIST := dist -HUGO := hugo ifeq ($(OS), Windows_NT) EXECUTABLE := $(NAME).exe @@ -58,7 +57,7 @@ sync: .PHONY: clean clean: go clean -i ./... - rm -rf $(BIN) $(DIST) $(HUGO) + rm -rf $(BIN) $(DIST) .PHONY: fmt fmt: @@ -131,24 +130,9 @@ release-check: .PHONY: release-finish release-finish: release-copy release-check -.PHONY: docs-copy -docs-copy: - mkdir -p $(HUGO); \ - mkdir -p $(HUGO)/content/extensions; \ - cd $(HUGO); \ - git init; \ - git remote rm origin; \ - git remote add origin https://github.com/owncloud/owncloud.github.io; \ - git fetch; \ - git checkout origin/source -f; \ - rsync --delete -ax ../docs/ content/extensions/$(NAME) - -.PHONY: docs-build -docs-build: - cd $(HUGO); hugo - -.PHONY: docs -docs: docs-copy docs-build +.PHONY: config-docs-generate +config-docs-generate: +# go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md .PHONY: watch watch: diff --git a/glauth/docs/_index.md b/glauth/docs/_index.md deleted file mode 100644 index 25756306d..000000000 --- a/glauth/docs/_index.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: "GLAuth" -date: 2018-05-02T00:00:00+00:00 -weight: 10 -geekdocRepo: https://github.com/owncloud/ocis-glauth -geekdocEditPath: edit/master/docs -geekdocFilePath: _index.md ---- - -This service provides a simple glauth world API which can be used by clients or other extensions. - -- reiner proxy -ldap für eos und firewall -- backend ist der accounts service \ No newline at end of file diff --git a/glauth/docs/building.md b/glauth/docs/building.md deleted file mode 100644 index 7dc26619f..000000000 --- a/glauth/docs/building.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -title: "Building" -date: 2018-05-02T00:00:00+00:00 -weight: 30 -geekdocRepo: https://github.com/owncloud/ocis-glauth -geekdocEditPath: edit/master/docs -geekdocFilePath: building.md ---- - -{{< toc >}} - -As this project is built with Go, so you need to install that first. The installation of Go is out of the scope of this document, please follow the official documentation for [Go](https://golang.org/doc/install), to build this project you have to install Go >= v1.13. After the installation of the required tools you need to get the sources: - -{{< highlight txt >}} -git clone https://github.com/owncloud/ocis-glauth.git -cd ocis-glauth -{{< / highlight >}} - -All required tool besides Go itself and make are bundled or getting automatically installed within the `GOPATH`. All commands to build this project are part of our `Makefile`. - -## Backend - -{{< highlight txt >}} -make generate -make build -{{< / highlight >}} - -Finally you should have the binary within the `bin/` folder now, give it a try with `./bin/ocis-glauth -h` to see all available options. diff --git a/glauth/docs/getting-started.md b/glauth/docs/getting-started.md deleted file mode 100644 index f28c31e1f..000000000 --- a/glauth/docs/getting-started.md +++ /dev/null @@ -1,272 +0,0 @@ ---- -title: "Getting Started" -date: 2018-05-02T00:00:00+00:00 -weight: 20 -geekdocRepo: https://github.com/owncloud/ocis-glauth -geekdocEditPath: edit/master/docs -geekdocFilePath: getting-started.md ---- - -{{< toc >}} - -## Installation - -So far we are offering two different variants for the installation. You can choose between [Docker](https://www.docker.com/) or pre-built binaries which are stored on our download mirrors and GitHub releases. Maybe we will also provide system packages for the major distributions later if we see the need for it. - -### Docker - -TBD - -### Binaries - -TBD - -## Configuration - -We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. - -### Envrionment variables - -If you prefer to configure the service with environment variables you can see the available variables below. - -#### Global - -GLAUTH_CONFIG_FILE -: Path to config file, empty default value - -GLAUTH_LOG_LEVEL -: Set logging level, defaults to `info` - -GLAUTH_LOG_COLOR -: Enable colored logging, defaults to `true` - -GLAUTH_LOG_PRETTY -: Enable pretty logging, defaults to `true` - -#### Server - -GLAUTH_TRACING_ENABLED -: Enable sending traces, defaults to `false` - -GLAUTH_TRACING_TYPE -: Tracing backend type, defaults to `jaeger` - -GLAUTH_TRACING_ENDPOINT -: Endpoint for the agent, empty default value - -GLAUTH_TRACING_COLLECTOR -: Endpoint for the collector, empty default value - -GLAUTH_TRACING_SERVICE -: Service name for tracing, defaults to `glauth` - -GLAUTH_DEBUG_ADDR -: Address to bind debug server, defaults to `0.0.0.0:9124` - -GLAUTH_DEBUG_TOKEN -: Token to grant metrics access, empty default value - -GLAUTH_DEBUG_PPROF -: Enable pprof debugging, defaults to `false` - -GLAUTH_DEBUG_ZPAGES -: Enable zpages debugging, defaults to `false` - -GLAUTH_HTTP_ADDR -: Address to bind http server, defaults to `0.0.0.0:9120` - -GLAUTH_HTTP_NAMESPACE -: The http namespace - -GLAUTH_HTTP_ROOT -: Root path of http server, defaults to `/` - -#### Health - -GLAUTH_DEBUG_ADDR -: Address to debug endpoint, defaults to `0.0.0.0:9124` - -### Commandline flags - -If you prefer to configure the service with commandline flags you can see the available variables below. - -#### Global - ---config-file -: Path to config file, empty default value - ---log-level -: Set logging level, defaults to `info` - ---log-color -: Enable colored logging, defaults to `true` - ---log-pretty -: Enable pretty logging, defaults to `true` - -#### Server - ---tracing-enabled -: Enable sending traces, defaults to `false` - ---tracing-type -: Tracing backend type, defaults to `jaeger` - ---tracing-endpoint -: Endpoint for the agent, empty default value - ---tracing-collector -: Endpoint for the collector, empty default value - ---tracing-service -: Service name for tracing, defaults to `glauth` - ---debug-addr -: Address to bind debug server, defaults to `0.0.0.0:9124` - ---debug-token -: Token to grant metrics access, empty default value - ---debug-pprof -: Enable pprof debugging, defaults to `false` - ---debug-zpages -: Enable zpages debugging, defaults to `false` - ---http-addr -: Address to bind http server, defaults to `0.0.0.0:9120` - ---http-namespace -: Namespace for internal services communication, defaults to `com.owncloud.web` - ---http-root -: Root path of http server, defaults to `/` - -#### Health - ---debug-addr -: Address to debug endpoint, defaults to `0.0.0.0:9124` - -### Configuration file - -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/glauth/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/glauth.yml`, `${HOME}/.ocis/glauth.yml` or `$(pwd)/config/glauth.yml`. - -## Usage - -The program provides a few sub-commands on execution. The available configuration methods have already been mentioned above. Generally you can always see a formated help output if you execute the binary via `ocis-glauth --help`. - -### Server - -The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute: - -{{< highlight txt >}} -ocis-glauth server --help -{{< / highlight >}} - -### Health - -The health command is used to execute a health check, if the exit code equals zero the service should be up and running, if the exist code is greater than zero the service is not in a healthy state. Generally this command is used within our Docker containers, it could also be used within Kubernetes. - -{{< highlight txt >}} -ocis-glauth health --help -{{< / highlight >}} - -## Metrics - -This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `GLAUTH_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9124/metrics`. - -go_gc_duration_seconds -: A summary of the GC invocation durations - -go_gc_duration_seconds_sum -: A summary of the GC invocation durations - -go_gc_duration_seconds_count -: A summary of the GC invocation durations - -go_goroutines -: Number of goroutines that currently exist - -go_info -: Information about the Go environment - -go_memstats_alloc_bytes -: Number of bytes allocated and still in use - -go_memstats_alloc_bytes_total -: Total number of bytes allocated, even if freed - -go_memstats_buck_hash_sys_bytes -: Number of bytes used by the profiling bucket hash table - -go_memstats_frees_total -: Total number of frees - -go_memstats_gc_cpu_fraction -: The fraction of this program's available CPU time used by the GC since the program started - -go_memstats_gc_sys_bytes -: Number of bytes used for garbage collection system metadata - -go_memstats_heap_alloc_bytes -: Number of heap bytes allocated and still in use - -go_memstats_heap_idle_bytes -: Number of heap bytes waiting to be used - -go_memstats_heap_inuse_bytes -: Number of heap bytes that are in use - -go_memstats_heap_objects -: Number of allocated objects - -go_memstats_heap_released_bytes -: Number of heap bytes released to OS - -go_memstats_heap_sys_bytes -: Number of heap bytes obtained from system - -go_memstats_last_gc_time_seconds -: Number of seconds since 1970 of last garbage collection - -go_memstats_lookups_total -: Total number of pointer lookups - -go_memstats_mallocs_total -: Total number of mallocs - -go_memstats_mcache_inuse_bytes -: Number of bytes in use by mcache structures - -go_memstats_mcache_sys_bytes -: Number of bytes used for mcache structures obtained from system - -go_memstats_mspan_inuse_bytes -: Number of bytes in use by mspan structures - -go_memstats_mspan_sys_bytes -: Number of bytes used for mspan structures obtained from system - -go_memstats_next_gc_bytes -: Number of heap bytes when next garbage collection will take place - -go_memstats_other_sys_bytes -: Number of bytes used for other system allocations - -go_memstats_stack_inuse_bytes -: Number of bytes in use by the stack allocator - -go_memstats_stack_sys_bytes -: Number of bytes obtained from system for stack allocator - -go_memstats_sys_bytes -: Number of bytes obtained from system - -go_threads -: Number of OS threads created - -promhttp_metric_handler_requests_in_flight -: Current number of scrapes being served - -promhttp_metric_handler_requests_total -: Total number of scrapes by HTTP status code diff --git a/glauth/docs/license.md b/glauth/docs/license.md deleted file mode 100644 index 914cd70bd..000000000 --- a/glauth/docs/license.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "License" -date: 2018-05-02T00:00:00+00:00 -weight: 40 -geekdocRepo: https://github.com/owncloud/ocis-glauth -geekdocEditPath: edit/master/docs -geekdocFilePath: license.md ---- - -This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/glauth/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/konnectd/Makefile b/konnectd/Makefile index 010a8e093..bf2af66fe 100644 --- a/konnectd/Makefile +++ b/konnectd/Makefile @@ -3,7 +3,6 @@ NAME := konnectd IMPORT := github.com/owncloud/ocis/$(NAME) BIN := bin DIST := dist -HUGO := hugo ifeq ($(OS), Windows_NT) EXECUTABLE := $(NAME).exe @@ -59,7 +58,7 @@ sync: .PHONY: clean clean: go clean -i ./... - rm -rf $(BIN) $(DIST) $(HUGO) + rm -rf $(BIN) $(DIST) .PHONY: fmt fmt: @@ -132,28 +131,9 @@ release-check: .PHONY: release-finish release-finish: release-copy release-check -.PHONY: docs-copy -docs-copy: - mkdir -p $(HUGO); \ - mkdir -p $(HUGO)/content/extensions; \ - cd $(HUGO); \ - git init; \ - git remote rm origin; \ - git remote add origin https://github.com/owncloud/owncloud.github.io; \ - git fetch; \ - git checkout origin/source -f; \ - rsync --delete -ax ../docs/ content/extensions/$(NAME) - .PHONY: config-docs-generate config-docs-generate: - go run github.com/owncloud/flaex >| docs/configuration.md - -.PHONY: docs-build -docs-build: - cd $(HUGO); hugo - -.PHONY: docs -docs: config-docs-generate docs-copy docs-build + go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md .PHONY: watch watch: diff --git a/konnectd/docs/_index.md b/konnectd/docs/_index.md deleted file mode 100644 index b12cd3b0e..000000000 --- a/konnectd/docs/_index.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: Konnectd -geekdocRepo: https://github.com/owncloud/ocis-konnectd -geekdocEditPath: edit/master/docs -geekdocFilePath: _index.md ---- - -This service provides an OpenID Connect provider which is the default way to authenticate in OCIS. diff --git a/konnectd/docs/building.md b/konnectd/docs/building.md deleted file mode 100644 index b044dd1d4..000000000 --- a/konnectd/docs/building.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -title: "Building" -date: 2020-02-21T00:00:00+00:00 -weight: 30 -geekdocRepo: https://github.com/owncloud/ocis-konnectd -geekdocEditPath: edit/master/docs -geekdocFilePath: building.md ---- - -{{< toc >}} - -As this project is built with Go, so you need to install that first. The installation of Go is out of the scope of this document, please follow the official documentation for [Go](https://golang.org/doc/install), to build this project you have to install Go >= v1.13. After the installation of the required tools you need to get the sources: - -{{< highlight txt >}} -git clone https://github.com/owncloud/ocis-konnectd.git -cd ocis-konnectd -{{< / highlight >}} - -All required tool besides Go itself and make are bundled or getting automatically installed within the `GOPATH`. All commands to build this project are part of our `Makefile`. - -## Backend - -{{< highlight txt >}} -make generate -make build -{{< / highlight >}} - -Finally you should have the binary within the `bin/` folder now, give it a try with `./bin/ocis-konnectd -h` to see all available options and subcommands. diff --git a/konnectd/docs/configuration.md b/konnectd/docs/configuration.md deleted file mode 100644 index 281b64fde..000000000 --- a/konnectd/docs/configuration.md +++ /dev/null @@ -1,176 +0,0 @@ ---- -title: "Configuration" -date: "2020-09-21T13:14:47+0200" -weight: 20 -geekdocRepo: https://github.com/owncloud/ocis-konnectd -geekdocEditPath: edit/master/docs -geekdocFilePath: configuration.md ---- - -{{< toc >}} - -## Configuration - -oCIS Single Binary is not responsible for configuring extensions. Instead, each extension could either be configured by environment variables, cli flags or config files. - -Each extension has its dedicated documentation page (e.g. https://owncloud.github.io/extensions/ocis_proxy/configuration) which lists all possible configurations. Config files and environment variables are picked up if you use the `./bin/ocis server` command within the oCIS single binary. Command line flags must be set explicitly on the extensions subcommands. - -### Configuration using config files - -Out of the box extensions will attempt to read configuration details from: - -```console -/etc/ocis -$HOME/.ocis -./config -``` - -For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. - -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. - -### Envrionment variables - -If you prefer to configure the service with environment variables you can see the available variables below. - -### Commandline flags - -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. - -## Root Command - -Serve Konnectd API for oCIS - -Usage: `ocis-konnectd [global options] command [command options] [arguments...]` - ---config-file | $KONNECTD_CONFIG_FILE -: Path to config file. - ---log-level | $KONNECTD_LOG_LEVEL -: Set logging level. Default: `info`. - ---log-pretty | $KONNECTD_LOG_PRETTY -: Enable pretty logging. Default: `true`. - ---log-color | $KONNECTD_LOG_COLOR -: Enable colored logging. Default: `true`. - -## Sub Commands - -### ocis-konnectd health - -Check health status - -Usage: `ocis-konnectd health [command options] [arguments...]` - ---debug-addr | $KONNECTD_DEBUG_ADDR -: Address to debug endpoint. Default: `0.0.0.0:9134`. - -### ocis-konnectd server - -Start integrated server - -Usage: `ocis-konnectd server [command options] [arguments...]` - ---tracing-enabled | $KONNECTD_TRACING_ENABLED -: Enable sending traces. - ---tracing-type | $KONNECTD_TRACING_TYPE -: Tracing backend type. Default: `jaeger`. - ---tracing-endpoint | $KONNECTD_TRACING_ENDPOINT -: Endpoint for the agent. - ---tracing-collector | $KONNECTD_TRACING_COLLECTOR -: Endpoint for the collector. - ---tracing-service | $KONNECTD_TRACING_SERVICE -: Service name for tracing. Default: `konnectd`. - ---debug-addr | $KONNECTD_DEBUG_ADDR -: Address to bind debug server. Default: `0.0.0.0:9134`. - ---debug-token | $KONNECTD_DEBUG_TOKEN -: Token to grant metrics access. - ---debug-pprof | $KONNECTD_DEBUG_PPROF -: Enable pprof debugging. - ---debug-zpages | $KONNECTD_DEBUG_ZPAGES -: Enable zpages debugging. - ---http-addr | $KONNECTD_HTTP_ADDR -: Address to bind http server. Default: `0.0.0.0:9130`. - ---http-root | $KONNECTD_HTTP_ROOT -: Root path of http server. Default: `/`. - ---http-namespace | $KONNECTD_HTTP_NAMESPACE -: Set the base namespace for service discovery. Default: `com.owncloud.web`. - ---identity-manager | $KONNECTD_IDENTITY_MANAGER -: Identity manager (one of ldap,kc,cookie,dummy). Default: `ldap`. - ---transport-tls-cert | $KONNECTD_TRANSPORT_TLS_CERT -: Certificate file for transport encryption. - ---transport-tls-key | $KONNECTD_TRANSPORT_TLS_KEY -: Secret file for transport encryption. - ---iss | $KONNECTD_ISS -: OIDC issuer URL. Default: `https://localhost:9200`. - ---signing-kid | $KONNECTD_SIGNING_KID -: Value of kid field to use in created tokens (uniquely identifying the signing-private-key). - ---validation-keys-path | $KONNECTD_VALIDATION_KEYS_PATH -: Full path to a folder containg PEM encoded private or public key files used for token validaton (file name without extension is used as kid). - ---encryption-secret | $KONNECTD_ENCRYPTION_SECRET -: Full path to a file containing a %d bytes secret key. - ---signing-method | $KONNECTD_SIGNING_METHOD -: JWT default signing method. Default: `PS256`. - ---uri-base-path | $KONNECTD_URI_BASE_PATH -: Custom base path for URI endpoints. - ---sign-in-uri | $KONNECTD_SIGN_IN_URI -: Custom redirection URI to sign-in form. - ---signed-out-uri | $KONNECTD_SIGN_OUT_URI -: Custom redirection URI to signed-out goodbye page. - ---authorization-endpoint-uri | $KONNECTD_ENDPOINT_URI -: Custom authorization endpoint URI. - ---endsession-endpoint-uri | $KONNECTD_ENDSESSION_ENDPOINT_URI -: Custom endsession endpoint URI. - ---asset-path | $KONNECTD_ASSET_PATH -: Path to custom assets. - ---identifier-client-path | $KONNECTD_IDENTIFIER_CLIENT_PATH -: Path to the identifier web client base folder. Default: `/var/tmp/konnectd`. - ---identifier-registration-conf | $KONNECTD_IDENTIFIER_REGISTRATION_CONF -: Path to a identifier-registration.yaml configuration file. Default: `./config/identifier-registration.yaml`. - ---identifier-scopes-conf | $KONNECTD_IDENTIFIER_SCOPES_CONF -: Path to a scopes.yaml configuration file. - ---insecure | $KONNECTD_INSECURE -: Disable TLS certificate and hostname validation. - ---tls | $KONNECTD_TLS -: Use TLS (disable only if konnectd is behind a TLS-terminating reverse-proxy).. Default: `false`. - ---allow-client-guests | $KONNECTD_ALLOW_CLIENT_GUESTS -: Allow sign in of client controlled guest users. - ---allow-dynamic-client-registration | $KONNECTD_ALLOW_DYNAMIC_CLIENT_REGISTRATION -: Allow dynamic OAuth2 client registration. - ---disable-identifier-webapp | $KONNECTD_DISABLE_IDENTIFIER_WEBAPP -: Disable built-in identifier-webapp to use a frontend hosted elsewhere.. Default: `true`. - diff --git a/konnectd/docs/getting-started.md b/konnectd/docs/getting-started.md deleted file mode 100644 index 96be58e3b..000000000 --- a/konnectd/docs/getting-started.md +++ /dev/null @@ -1,154 +0,0 @@ ---- -title: "Getting Started" -date: 2018-05-02T00:00:00+00:00 -weight: 10 -geekdocRepo: https://github.com/owncloud/ocis-konnectd -geekdocEditPath: edit/master/docs -geekdocFilePath: getting-started.md ---- - -{{< toc >}} - -## Installation - -So far we are offering two different variants for the installation. You can choose between [Docker](https://www.docker.com/) or pre-built binaries which are stored on our download mirrors and GitHub releases. Maybe we will also provide system packages for the major distributions later if we see the need for it. - -### Docker - -Docker images for ocis-reva are hosted on https://hub.docker.com/r/owncloud/ocis-konnectd. - -The `latest` tag always reflects the current master branch. - -```console -docker pull owncloud/ocis-konnectd -``` - -### Binaries - -The pre-built binaries for different platforms are downloadable at https://download.owncloud.com/ocis/ocis-konnectd/ . Specific releases are organized in separate folders. They are in sync which every release tag on GitHub. The binaries from the current master branch can be found in https://download.owncloud.com/ocis/ocis-konnectd/testing/ - -```console -curl https://download.owncloud.com/ocis/ocis-konnectd/1.0.0-beta1/ocis-konnectd-1.0.0-beta1-darwin-amd64 --output ocis-konnectd -chmod +x ocis-konnectd -./ocis-konnectd server -``` - -## Usage - -The program provides a few sub-commands on execution. The available configuration methods have already been mentioned above. Generally you can always see a formated help output if you execute the binary via `ocis-konnectd --help`. - -### Server - -The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute: - -{{< highlight txt >}} -ocis-konnectd server --help -{{< / highlight >}} - -### Health - -The health command is used to execute a health check, if the exit code equals zero the service should be up and running, if the exist code is greater than zero the service is not in a healthy state. Generally this command is used within our Docker containers, it could also be used within Kubernetes. - -{{< highlight txt >}} -ocis-konnectd health --help -{{< / highlight >}} - -## Metrics - -This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `KONNECTD_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9134/metrics`. - -go_gc_duration_seconds -: A summary of the GC invocation durations - -go_gc_duration_seconds_sum -: A summary of the GC invocation durations - -go_gc_duration_seconds_count -: A summary of the GC invocation durations - -go_goroutines -: Number of goroutines that currently exist - -go_info -: Information about the Go environment - -go_memstats_alloc_bytes -: Number of bytes allocated and still in use - -go_memstats_alloc_bytes_total -: Total number of bytes allocated, even if freed - -go_memstats_buck_hash_sys_bytes -: Number of bytes used by the profiling bucket hash table - -go_memstats_frees_total -: Total number of frees - -go_memstats_gc_cpu_fraction -: The fraction of this program's available CPU time used by the GC since the program started - -go_memstats_gc_sys_bytes -: Number of bytes used for garbage collection system metadata - -go_memstats_heap_alloc_bytes -: Number of heap bytes allocated and still in use - -go_memstats_heap_idle_bytes -: Number of heap bytes waiting to be used - -go_memstats_heap_inuse_bytes -: Number of heap bytes that are in use - -go_memstats_heap_objects -: Number of allocated objects - -go_memstats_heap_released_bytes -: Number of heap bytes released to OS - -go_memstats_heap_sys_bytes -: Number of heap bytes obtained from system - -go_memstats_last_gc_time_seconds -: Number of seconds since 1970 of last garbage collection - -go_memstats_lookups_total -: Total number of pointer lookups - -go_memstats_mallocs_total -: Total number of mallocs - -go_memstats_mcache_inuse_bytes -: Number of bytes in use by mcache structures - -go_memstats_mcache_sys_bytes -: Number of bytes used for mcache structures obtained from system - -go_memstats_mspan_inuse_bytes -: Number of bytes in use by mspan structures - -go_memstats_mspan_sys_bytes -: Number of bytes used for mspan structures obtained from system - -go_memstats_next_gc_bytes -: Number of heap bytes when next garbage collection will take place - -go_memstats_other_sys_bytes -: Number of bytes used for other system allocations - -go_memstats_stack_inuse_bytes -: Number of bytes in use by the stack allocator - -go_memstats_stack_sys_bytes -: Number of bytes obtained from system for stack allocator - -go_memstats_sys_bytes -: Number of bytes obtained from system - -go_threads -: Number of OS threads created - -promhttp_metric_handler_requests_in_flight -: Current number of scrapes being served - -promhttp_metric_handler_requests_total -: Total number of scrapes by HTTP status code diff --git a/ocis/Makefile b/ocis/Makefile index 62441307d..87cf5746a 100644 --- a/ocis/Makefile +++ b/ocis/Makefile @@ -140,29 +140,9 @@ release-check: .PHONY: release-finish release-finish: release-copy release-check -.PHONY: docs-copy -docs-copy: - mkdir -p $(HUGO); \ - mkdir -p $(HUGO)/content/; \ - cd $(HUGO); \ - git init; \ - git remote rm origin; \ - git remote add origin https://github.com/owncloud/owncloud.github.io; \ - git fetch --depth=1; \ - git checkout origin/source -f; \ - rsync --delete -ax --exclude 'static' ../docs/ content/$(NAME); \ - rsync --delete -ax ../docs/static/ static/$(NAME); \ - .PHONY: config-docs-generate config-docs-generate: - go run github.com/owncloud/flaex >| docs/configuration.md - -.PHONY: docs-build -docs-build: - cd $(HUGO); hugo - -.PHONY: docs -docs: config-docs-generate docs-copy docs-build + go run github.com/owncloud/flaex >| ../docs/ocis/configuration.md .PHONY: watch watch: