From d6694bcc3eab761dfb3fa7ce7310ffdab1689adc Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 18 Sep 2020 13:36:01 +0200 Subject: [PATCH] rename phoenix -> ocis-phoenix --- {phoenix => ocis-phoenix}/.codacy.yml | 0 {phoenix => ocis-phoenix}/.dockerignore | 0 {phoenix => ocis-phoenix}/.drone.star | 0 {phoenix => ocis-phoenix}/.editorconfig | 0 {phoenix => ocis-phoenix}/.github/config.yml | 2 +- .../.github/issue_template.md | 0 .../.github/pull_request_template.md | 0 .../.github/settings.yml | 0 {phoenix => ocis-phoenix}/.gitignore | 0 {phoenix => ocis-phoenix}/CHANGELOG.md | 176 +++++++++--------- {phoenix => ocis-phoenix}/LICENSE | 0 {phoenix => ocis-phoenix}/Makefile | 0 {phoenix => ocis-phoenix}/README.md | 0 .../0.1.0_2020-02-03/initial-release.md | 2 +- .../0.10.0_2020-07-17/update-phoenix | 2 +- .../exit-on-unresolved-assets.md | 4 +- .../0.11.0_2020-08-17/hide-searchbar.md | 2 +- .../0.11.0_2020-08-17/update-phoenix.md | 2 +- .../0.11.0_2020-08-17/use-alpine-latest.md | 2 +- .../0.12.0_2020-08-19/enable-external-apps.md | 2 +- .../0.12.0_2020-08-19/update-phoenix.md | 2 +- .../0.13.0_2020-08-25/update-phoenix | 2 +- .../0.2.0_2020-03-17/config-file-parsing.md | 6 +- .../changelog/0.2.0_2020-03-17/issue-43.md | 2 +- .../changelog/0.2.0_2020-03-17/phoenix-0.6.0 | 2 +- .../0.3.0_2020-03-17/new-ocis-config.md | 2 +- .../changelog/0.4.0_2020-03-31/config.md | 2 +- .../changelog/0.4.0_2020-03-31/update-phoenix | 2 +- .../changelog/0.4.1_2020-04-01/fix-tag | 2 +- .../changelog/0.5.0_2020-04-14/update-phoenix | 2 +- .../changelog/0.6.0_2020-04-28/update-phoenix | 2 +- .../changelog/0.7.0_2020-05-26/update-phoenix | 2 +- .../changelog/0.8.0_2020-06-26/update-phoenix | 2 +- .../changelog/0.8.1_2020-06-29/update-phoenix | 2 +- .../add-silentrefresh-middleware | 2 +- .../changelog/0.9.0_2020-07-10/update-phoenix | 2 +- .../changelog/CHANGELOG.tmpl | 6 +- {phoenix => ocis-phoenix}/changelog/README.md | 0 {phoenix => ocis-phoenix}/changelog/TEMPLATE | 4 +- .../changelog/unreleased/.keep | 0 .../unreleased/fix-external-app-urls | 2 +- .../changelog/unreleased/remove-pdf-viewer.md | 2 +- .../cmd/ocis-phoenix/main.go | 2 +- {phoenix => ocis-phoenix}/config/example.json | 0 {phoenix => ocis-phoenix}/config/example.yml | 0 .../docker/Dockerfile.linux.amd64 | 0 .../docker/Dockerfile.linux.arm | 0 .../docker/Dockerfile.linux.arm64 | 0 .../docker/manifest.tmpl | 0 {phoenix => ocis-phoenix}/docs/_index.md | 0 {phoenix => ocis-phoenix}/docs/building.md | 0 .../docs/getting-started.md | 2 +- {phoenix => ocis-phoenix}/docs/license.md | 2 +- {phoenix => ocis-phoenix}/docs/releasing.md | 0 {phoenix => ocis-phoenix}/go.mod | 7 +- {phoenix => ocis-phoenix}/go.sum | 1 + .../pkg/assets/assets.go | 2 +- {phoenix => ocis-phoenix}/pkg/assets/dummy.go | 0 {phoenix => ocis-phoenix}/pkg/assets/embed.go | 0 .../pkg/assets/embed.yml | 0 .../pkg/assets/option.go | 2 +- .../pkg/command/health.go | 4 +- {phoenix => ocis-phoenix}/pkg/command/root.go | 6 +- .../pkg/command/server.go | 10 +- .../pkg/config/config.go | 0 .../pkg/flagset/flagset.go | 2 +- .../pkg/metrics/metrics.go | 0 .../pkg/middleware/silentrefresh.go | 0 .../pkg/server/debug/option.go | 2 +- .../pkg/server/debug/server.go | 4 +- .../pkg/server/http/option.go | 4 +- .../pkg/server/http/server.go | 6 +- .../pkg/service/v0/instrument.go | 2 +- .../pkg/service/v0/logging.go | 0 .../pkg/service/v0/option.go | 2 +- .../pkg/service/v0/service.go | 4 +- .../pkg/service/v0/tracing.go | 0 .../pkg/version/version.go | 0 {phoenix => ocis-phoenix}/reflex.conf | 0 {phoenix => ocis-phoenix}/tools.go | 0 phoenix/config/.gitignore | 3 - 81 files changed, 152 insertions(+), 159 deletions(-) rename {phoenix => ocis-phoenix}/.codacy.yml (100%) rename {phoenix => ocis-phoenix}/.dockerignore (100%) rename {phoenix => ocis-phoenix}/.drone.star (100%) rename {phoenix => ocis-phoenix}/.editorconfig (100%) rename {phoenix => ocis-phoenix}/.github/config.yml (79%) rename {phoenix => ocis-phoenix}/.github/issue_template.md (100%) rename {phoenix => ocis-phoenix}/.github/pull_request_template.md (100%) rename {phoenix => ocis-phoenix}/.github/settings.yml (100%) rename {phoenix => ocis-phoenix}/.gitignore (100%) rename {phoenix => ocis-phoenix}/CHANGELOG.md (65%) rename {phoenix => ocis-phoenix}/LICENSE (100%) rename {phoenix => ocis-phoenix}/Makefile (100%) rename {phoenix => ocis-phoenix}/README.md (100%) rename {phoenix => ocis-phoenix}/changelog/0.1.0_2020-02-03/initial-release.md (80%) rename {phoenix => ocis-phoenix}/changelog/0.10.0_2020-07-17/update-phoenix (54%) rename {phoenix => ocis-phoenix}/changelog/0.11.0_2020-08-17/exit-on-unresolved-assets.md (83%) rename {phoenix => ocis-phoenix}/changelog/0.11.0_2020-08-17/hide-searchbar.md (76%) rename {phoenix => ocis-phoenix}/changelog/0.11.0_2020-08-17/update-phoenix.md (54%) rename {phoenix => ocis-phoenix}/changelog/0.11.0_2020-08-17/use-alpine-latest.md (75%) rename {phoenix => ocis-phoenix}/changelog/0.12.0_2020-08-19/enable-external-apps.md (75%) rename {phoenix => ocis-phoenix}/changelog/0.12.0_2020-08-19/update-phoenix.md (69%) rename {phoenix => ocis-phoenix}/changelog/0.13.0_2020-08-25/update-phoenix (69%) rename {phoenix => ocis-phoenix}/changelog/0.2.0_2020-03-17/config-file-parsing.md (51%) rename {phoenix => ocis-phoenix}/changelog/0.2.0_2020-03-17/issue-43.md (55%) rename {phoenix => ocis-phoenix}/changelog/0.2.0_2020-03-17/phoenix-0.6.0 (56%) rename {phoenix => ocis-phoenix}/changelog/0.3.0_2020-03-17/new-ocis-config.md (78%) rename {phoenix => ocis-phoenix}/changelog/0.4.0_2020-03-31/config.md (79%) rename {phoenix => ocis-phoenix}/changelog/0.4.0_2020-03-31/update-phoenix (53%) rename {phoenix => ocis-phoenix}/changelog/0.4.1_2020-04-01/fix-tag (69%) rename {phoenix => ocis-phoenix}/changelog/0.5.0_2020-04-14/update-phoenix (53%) rename {phoenix => ocis-phoenix}/changelog/0.6.0_2020-04-28/update-phoenix (53%) rename {phoenix => ocis-phoenix}/changelog/0.7.0_2020-05-26/update-phoenix (54%) rename {phoenix => ocis-phoenix}/changelog/0.8.0_2020-06-26/update-phoenix (54%) rename {phoenix => ocis-phoenix}/changelog/0.8.1_2020-06-29/update-phoenix (54%) rename {phoenix => ocis-phoenix}/changelog/0.9.0_2020-07-10/add-silentrefresh-middleware (79%) rename {phoenix => ocis-phoenix}/changelog/0.9.0_2020-07-10/update-phoenix (54%) rename {phoenix => ocis-phoenix}/changelog/CHANGELOG.tmpl (77%) rename {phoenix => ocis-phoenix}/changelog/README.md (100%) rename {phoenix => ocis-phoenix}/changelog/TEMPLATE (77%) rename {phoenix => ocis-phoenix}/changelog/unreleased/.keep (100%) rename {phoenix => ocis-phoenix}/changelog/unreleased/fix-external-app-urls (79%) rename {phoenix => ocis-phoenix}/changelog/unreleased/remove-pdf-viewer.md (79%) rename {phoenix => ocis-phoenix}/cmd/ocis-phoenix/main.go (67%) rename {phoenix => ocis-phoenix}/config/example.json (100%) rename {phoenix => ocis-phoenix}/config/example.yml (100%) rename {phoenix => ocis-phoenix}/docker/Dockerfile.linux.amd64 (100%) rename {phoenix => ocis-phoenix}/docker/Dockerfile.linux.arm (100%) rename {phoenix => ocis-phoenix}/docker/Dockerfile.linux.arm64 (100%) rename {phoenix => ocis-phoenix}/docker/manifest.tmpl (100%) rename {phoenix => ocis-phoenix}/docs/_index.md (100%) rename {phoenix => ocis-phoenix}/docs/building.md (100%) rename {phoenix => ocis-phoenix}/docs/getting-started.md (96%) rename {phoenix => ocis-phoenix}/docs/license.md (64%) rename {phoenix => ocis-phoenix}/docs/releasing.md (100%) rename {phoenix => ocis-phoenix}/go.mod (65%) rename {phoenix => ocis-phoenix}/go.sum (99%) rename {phoenix => ocis-phoenix}/pkg/assets/assets.go (95%) rename {phoenix => ocis-phoenix}/pkg/assets/dummy.go (100%) rename {phoenix => ocis-phoenix}/pkg/assets/embed.go (100%) rename {phoenix => ocis-phoenix}/pkg/assets/embed.yml (100%) rename {phoenix => ocis-phoenix}/pkg/assets/option.go (93%) rename {phoenix => ocis-phoenix}/pkg/command/health.go (88%) rename {phoenix => ocis-phoenix}/pkg/command/root.go (92%) rename {phoenix => ocis-phoenix}/pkg/command/server.go (94%) rename {phoenix => ocis-phoenix}/pkg/config/config.go (100%) rename {phoenix => ocis-phoenix}/pkg/flagset/flagset.go (99%) rename {phoenix => ocis-phoenix}/pkg/metrics/metrics.go (100%) rename {phoenix => ocis-phoenix}/pkg/middleware/silentrefresh.go (100%) rename {phoenix => ocis-phoenix}/pkg/server/debug/option.go (94%) rename {phoenix => ocis-phoenix}/pkg/server/debug/server.go (92%) rename {phoenix => ocis-phoenix}/pkg/server/http/option.go (93%) rename {phoenix => ocis-phoenix}/pkg/server/http/server.go (86%) rename {phoenix => ocis-phoenix}/pkg/service/v0/instrument.go (91%) rename {phoenix => ocis-phoenix}/pkg/service/v0/logging.go (100%) rename {phoenix => ocis-phoenix}/pkg/service/v0/option.go (94%) rename {phoenix => ocis-phoenix}/pkg/service/v0/service.go (97%) rename {phoenix => ocis-phoenix}/pkg/service/v0/tracing.go (100%) rename {phoenix => ocis-phoenix}/pkg/version/version.go (100%) rename {phoenix => ocis-phoenix}/reflex.conf (100%) rename {phoenix => ocis-phoenix}/tools.go (100%) delete mode 100644 phoenix/config/.gitignore diff --git a/phoenix/.codacy.yml b/ocis-phoenix/.codacy.yml similarity index 100% rename from phoenix/.codacy.yml rename to ocis-phoenix/.codacy.yml diff --git a/phoenix/.dockerignore b/ocis-phoenix/.dockerignore similarity index 100% rename from phoenix/.dockerignore rename to ocis-phoenix/.dockerignore diff --git a/phoenix/.drone.star b/ocis-phoenix/.drone.star similarity index 100% rename from phoenix/.drone.star rename to ocis-phoenix/.drone.star diff --git a/phoenix/.editorconfig b/ocis-phoenix/.editorconfig similarity index 100% rename from phoenix/.editorconfig rename to ocis-phoenix/.editorconfig diff --git a/phoenix/.github/config.yml b/ocis-phoenix/.github/config.yml similarity index 79% rename from phoenix/.github/config.yml rename to ocis-phoenix/.github/config.yml index 1ff37cb8a..b8f69fa2c 100644 --- a/phoenix/.github/config.yml +++ b/ocis-phoenix/.github/config.yml @@ -2,7 +2,7 @@ # Comment to be posted to on PRs that don't update documentation updateDocsComment: > - Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis-phoenix/blob/master/changelog/README.md) item based on your changes. + Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis/ocis-phoenix/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only - tests-only diff --git a/phoenix/.github/issue_template.md b/ocis-phoenix/.github/issue_template.md similarity index 100% rename from phoenix/.github/issue_template.md rename to ocis-phoenix/.github/issue_template.md diff --git a/phoenix/.github/pull_request_template.md b/ocis-phoenix/.github/pull_request_template.md similarity index 100% rename from phoenix/.github/pull_request_template.md rename to ocis-phoenix/.github/pull_request_template.md diff --git a/phoenix/.github/settings.yml b/ocis-phoenix/.github/settings.yml similarity index 100% rename from phoenix/.github/settings.yml rename to ocis-phoenix/.github/settings.yml diff --git a/phoenix/.gitignore b/ocis-phoenix/.gitignore similarity index 100% rename from phoenix/.gitignore rename to ocis-phoenix/.gitignore diff --git a/phoenix/CHANGELOG.md b/ocis-phoenix/CHANGELOG.md similarity index 65% rename from phoenix/CHANGELOG.md rename to ocis-phoenix/CHANGELOG.md index c4d376057..7d00f6560 100644 --- a/phoenix/CHANGELOG.md +++ b/ocis-phoenix/CHANGELOG.md @@ -2,12 +2,12 @@ The following sections list the changes in ocis-phoenix unreleased. -[unreleased]: https://github.com/owncloud/ocis-phoenix/compare/v0.13.0...master +[unreleased]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.13.0...master ## Summary * Bugfix - Fix external app URLs: [#218](https://github.com/owncloud/product/issues/218) -* Change - Remove pdf-viewer from default apps: [#85](https://github.com/owncloud/ocis-phoenix/pull/85) +* Change - Remove pdf-viewer from default apps: [#85](https://github.com/owncloud/ocis/ocis-phoenix/pull/85) ## Details @@ -17,77 +17,77 @@ The following sections list the changes in ocis-phoenix unreleased. using relative paths instead. https://github.com/owncloud/product/issues/218 - https://github.com/owncloud/ocis-phoenix/pull/83 + https://github.com/owncloud/ocis/ocis-phoenix/pull/83 -* Change - Remove pdf-viewer from default apps: [#85](https://github.com/owncloud/ocis-phoenix/pull/85) +* Change - Remove pdf-viewer from default apps: [#85](https://github.com/owncloud/ocis/ocis-phoenix/pull/85) OCIS-web doesn't have a dedicated pdf-viewer app anymore but instead uses the default browser behaviour for PDFs. We removed pdf-viewer from the set of default apps. - https://github.com/owncloud/ocis-phoenix/pull/85 + https://github.com/owncloud/ocis/ocis-phoenix/pull/85 # Changelog for [0.13.0] (2020-08-25) The following sections list the changes in ocis-phoenix 0.13.0. -[0.13.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.12.0...v0.13.0 +[0.13.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.12.0...v0.13.0 ## Summary -* Change - Update Phoenix: [#81](https://github.com/owncloud/ocis-phoenix/pull/81) +* Change - Update Phoenix: [#81](https://github.com/owncloud/ocis/ocis-phoenix/pull/81) ## Details -* Change - Update Phoenix: [#81](https://github.com/owncloud/ocis-phoenix/pull/81) +* Change - Update Phoenix: [#81](https://github.com/owncloud/ocis/ocis-phoenix/pull/81) Updated phoenix from v0.15.0 to v0.16.0 - https://github.com/owncloud/ocis-phoenix/pull/81 + https://github.com/owncloud/ocis/ocis-phoenix/pull/81 https://github.com/owncloud/phoenix/releases/tag/v0.16.0 # Changelog for [0.12.0] (2020-08-19) The following sections list the changes in ocis-phoenix 0.12.0. -[0.12.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.11.0...v0.12.0 +[0.12.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.11.0...v0.12.0 ## Summary -* Change - Enable Settings and Accounts apps by default: [#80](https://github.com/owncloud/ocis-phoenix/pull/80) -* Change - Update Phoenix: [#79](https://github.com/owncloud/ocis-phoenix/pull/79) +* Change - Enable Settings and Accounts apps by default: [#80](https://github.com/owncloud/ocis/ocis-phoenix/pull/80) +* Change - Update Phoenix: [#79](https://github.com/owncloud/ocis/ocis-phoenix/pull/79) ## Details -* Change - Enable Settings and Accounts apps by default: [#80](https://github.com/owncloud/ocis-phoenix/pull/80) +* Change - Enable Settings and Accounts apps by default: [#80](https://github.com/owncloud/ocis/ocis-phoenix/pull/80) The default ocis-web config now adds the frontend of ocis-accounts and ocis-settings to the builtin web config. - https://github.com/owncloud/ocis-phoenix/pull/80 + https://github.com/owncloud/ocis/ocis-phoenix/pull/80 -* Change - Update Phoenix: [#79](https://github.com/owncloud/ocis-phoenix/pull/79) +* Change - Update Phoenix: [#79](https://github.com/owncloud/ocis/ocis-phoenix/pull/79) Updated phoenix from v0.14.0 to v0.15.0 - https://github.com/owncloud/ocis-phoenix/pull/79 + https://github.com/owncloud/ocis/ocis-phoenix/pull/79 https://github.com/owncloud/phoenix/releases/tag/v0.15.0 # Changelog for [0.11.0] (2020-08-17) The following sections list the changes in ocis-phoenix 0.11.0. -[0.11.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.10.0...v0.11.0 +[0.11.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.10.0...v0.11.0 ## Summary -* Bugfix - Exit when assets or config are not found: [#76](https://github.com/owncloud/ocis-phoenix/pull/76) -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#73](https://github.com/owncloud/ocis-phoenix/pull/73) +* Bugfix - Exit when assets or config are not found: [#76](https://github.com/owncloud/ocis/ocis-phoenix/pull/76) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#73](https://github.com/owncloud/ocis/ocis-phoenix/pull/73) * Change - Hide searchbar by default: [#116](https://github.com/owncloud/product/issues/116) -* Change - Update Phoenix: [#78](https://github.com/owncloud/ocis-phoenix/pull/78) +* Change - Update Phoenix: [#78](https://github.com/owncloud/ocis/ocis-phoenix/pull/78) ## Details -* Bugfix - Exit when assets or config are not found: [#76](https://github.com/owncloud/ocis-phoenix/pull/76) +* Bugfix - Exit when assets or config are not found: [#76](https://github.com/owncloud/ocis/ocis-phoenix/pull/76) When a non-existing assets folder is specified, there was only a warning log statement and the service served the builtin assets instead. It is safe to exit the service in such a scenario, @@ -96,56 +96,56 @@ The following sections list the changes in ocis-phoenix 0.11.0. showing an error in the web ui, wenn the specified config file could not be found. We changed the log level to `Fatal` as well. - https://github.com/owncloud/ocis-phoenix/pull/76 - https://github.com/owncloud/ocis-phoenix/pull/77 + https://github.com/owncloud/ocis/ocis-phoenix/pull/76 + https://github.com/owncloud/ocis/ocis-phoenix/pull/77 -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#73](https://github.com/owncloud/ocis-phoenix/pull/73) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#73](https://github.com/owncloud/ocis/ocis-phoenix/pull/73) ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - https://github.com/owncloud/ocis-phoenix/pull/73 + https://github.com/owncloud/ocis/ocis-phoenix/pull/73 * Change - Hide searchbar by default: [#116](https://github.com/owncloud/product/issues/116) Since file search is not working at the moment we decided to hide the search bar by default. https://github.com/owncloud/product/issues/116 - https://github.com/owncloud/ocis-phoenix/pull/74 + https://github.com/owncloud/ocis/ocis-phoenix/pull/74 -* Change - Update Phoenix: [#78](https://github.com/owncloud/ocis-phoenix/pull/78) +* Change - Update Phoenix: [#78](https://github.com/owncloud/ocis/ocis-phoenix/pull/78) Updated phoenix from v0.13.0 to v0.14.0 - https://github.com/owncloud/ocis-phoenix/pull/78 + https://github.com/owncloud/ocis/ocis-phoenix/pull/78 # Changelog for [0.10.0] (2020-07-17) The following sections list the changes in ocis-phoenix 0.10.0. -[0.10.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.9.0...v0.10.0 +[0.10.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.9.0...v0.10.0 ## Summary -* Change - Update Phoenix: [#72](https://github.com/owncloud/ocis-phoenix/pull/72) +* Change - Update Phoenix: [#72](https://github.com/owncloud/ocis/ocis-phoenix/pull/72) ## Details -* Change - Update Phoenix: [#72](https://github.com/owncloud/ocis-phoenix/pull/72) +* Change - Update Phoenix: [#72](https://github.com/owncloud/ocis/ocis-phoenix/pull/72) Updated phoenix from v0.12.0 to v0.13.0 - https://github.com/owncloud/ocis-phoenix/pull/72 + https://github.com/owncloud/ocis/ocis-phoenix/pull/72 # Changelog for [0.9.0] (2020-07-10) The following sections list the changes in ocis-phoenix 0.9.0. -[0.9.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.8.1...v0.9.0 +[0.9.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.8.1...v0.9.0 ## Summary * Bugfix - Allow silent refresh of access token: [#69](https://github.com/owncloud/ocis-konnectd/issues/69) -* Change - Update Phoenix: [#70](https://github.com/owncloud/ocis-phoenix/pull/70) +* Change - Update Phoenix: [#70](https://github.com/owncloud/ocis/ocis-phoenix/pull/70) ## Details @@ -155,219 +155,219 @@ The following sections list the changes in ocis-phoenix 0.9.0. an iframe. https://github.com/owncloud/ocis-konnectd/issues/69 - https://github.com/owncloud/ocis-phoenix/pull/69 + https://github.com/owncloud/ocis/ocis-phoenix/pull/69 -* Change - Update Phoenix: [#70](https://github.com/owncloud/ocis-phoenix/pull/70) +* Change - Update Phoenix: [#70](https://github.com/owncloud/ocis/ocis-phoenix/pull/70) Updated phoenix from v0.11.1 to v0.12.0 - https://github.com/owncloud/ocis-phoenix/pull/70 + https://github.com/owncloud/ocis/ocis-phoenix/pull/70 # Changelog for [0.8.1] (2020-06-29) The following sections list the changes in ocis-phoenix 0.8.1. -[0.8.1]: https://github.com/owncloud/ocis-phoenix/compare/v0.8.0...v0.8.1 +[0.8.1]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.8.0...v0.8.1 ## Summary -* Change - Update Phoenix: [#68](https://github.com/owncloud/ocis-phoenix/pull/68) +* Change - Update Phoenix: [#68](https://github.com/owncloud/ocis/ocis-phoenix/pull/68) ## Details -* Change - Update Phoenix: [#68](https://github.com/owncloud/ocis-phoenix/pull/68) +* Change - Update Phoenix: [#68](https://github.com/owncloud/ocis/ocis-phoenix/pull/68) Updated phoenix from v0.11.0 to v0.11.1 - https://github.com/owncloud/ocis-phoenix/pull/68 + https://github.com/owncloud/ocis/ocis-phoenix/pull/68 # Changelog for [0.8.0] (2020-06-26) The following sections list the changes in ocis-phoenix 0.8.0. -[0.8.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.7.0...v0.8.0 +[0.8.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.7.0...v0.8.0 ## Summary -* Change - Update Phoenix: [#67](https://github.com/owncloud/ocis-phoenix/pull/67) +* Change - Update Phoenix: [#67](https://github.com/owncloud/ocis/ocis-phoenix/pull/67) ## Details -* Change - Update Phoenix: [#67](https://github.com/owncloud/ocis-phoenix/pull/67) +* Change - Update Phoenix: [#67](https://github.com/owncloud/ocis/ocis-phoenix/pull/67) Updated phoenix from v0.10.0 to v0.11.0 - https://github.com/owncloud/ocis-phoenix/pull/67 + https://github.com/owncloud/ocis/ocis-phoenix/pull/67 # Changelog for [0.7.0] (2020-05-26) The following sections list the changes in ocis-phoenix 0.7.0. -[0.7.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.6.0...v0.7.0 +[0.7.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.6.0...v0.7.0 ## Summary -* Change - Update Phoenix: [#66](https://github.com/owncloud/ocis-phoenix/pull/66) +* Change - Update Phoenix: [#66](https://github.com/owncloud/ocis/ocis-phoenix/pull/66) ## Details -* Change - Update Phoenix: [#66](https://github.com/owncloud/ocis-phoenix/pull/66) +* Change - Update Phoenix: [#66](https://github.com/owncloud/ocis/ocis-phoenix/pull/66) Updated phoenix from v0.9.0 to v0.10.0 - https://github.com/owncloud/ocis-phoenix/pull/66 + https://github.com/owncloud/ocis/ocis-phoenix/pull/66 # Changelog for [0.6.0] (2020-04-28) The following sections list the changes in ocis-phoenix 0.6.0. -[0.6.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.5.0...v0.6.0 +[0.6.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.5.0...v0.6.0 ## Summary -* Change - Update Phoenix: [#65](https://github.com/owncloud/ocis-phoenix/pull/65) +* Change - Update Phoenix: [#65](https://github.com/owncloud/ocis/ocis-phoenix/pull/65) ## Details -* Change - Update Phoenix: [#65](https://github.com/owncloud/ocis-phoenix/pull/65) +* Change - Update Phoenix: [#65](https://github.com/owncloud/ocis/ocis-phoenix/pull/65) Updated phoenix from v0.8.0 to v0.9.0 - https://github.com/owncloud/ocis-phoenix/pull/65 + https://github.com/owncloud/ocis/ocis-phoenix/pull/65 # Changelog for [0.5.0] (2020-04-14) The following sections list the changes in ocis-phoenix 0.5.0. -[0.5.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.4.1...v0.5.0 +[0.5.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.4.1...v0.5.0 ## Summary -* Change - Update Phoenix: [#63](https://github.com/owncloud/ocis-phoenix/pull/63) +* Change - Update Phoenix: [#63](https://github.com/owncloud/ocis/ocis-phoenix/pull/63) ## Details -* Change - Update Phoenix: [#63](https://github.com/owncloud/ocis-phoenix/pull/63) +* Change - Update Phoenix: [#63](https://github.com/owncloud/ocis/ocis-phoenix/pull/63) Updated phoenix from v0.7.0 to v0.8.0 - https://github.com/owncloud/ocis-phoenix/pull/63 + https://github.com/owncloud/ocis/ocis-phoenix/pull/63 # Changelog for [0.4.1] (2020-04-01) The following sections list the changes in ocis-phoenix 0.4.1. -[0.4.1]: https://github.com/owncloud/ocis-phoenix/compare/v0.4.0...v0.4.1 +[0.4.1]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.4.0...v0.4.1 ## Summary -* Bugfix - Create a new tag to fix v0.4.0: [#62](https://github.com/owncloud/ocis-phoenix/pull/62) +* Bugfix - Create a new tag to fix v0.4.0: [#62](https://github.com/owncloud/ocis/ocis-phoenix/pull/62) ## Details -* Bugfix - Create a new tag to fix v0.4.0: [#62](https://github.com/owncloud/ocis-phoenix/pull/62) +* Bugfix - Create a new tag to fix v0.4.0: [#62](https://github.com/owncloud/ocis/ocis-phoenix/pull/62) Release v0.4.0 is using the wrong assets. We fixed that by creating a new release. - https://github.com/owncloud/ocis-phoenix/pull/62 + https://github.com/owncloud/ocis/ocis-phoenix/pull/62 # Changelog for [0.4.0] (2020-03-31) The following sections list the changes in ocis-phoenix 0.4.0. -[0.4.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.2.0...v0.4.0 +[0.4.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.2.0...v0.4.0 ## Summary -* Change - Update Phoenix: [#60](https://github.com/owncloud/ocis-phoenix/pull/60) -* Enhancement - Configuration: [#57](https://github.com/owncloud/ocis-phoenix/pull/57) +* Change - Update Phoenix: [#60](https://github.com/owncloud/ocis/ocis-phoenix/pull/60) +* Enhancement - Configuration: [#57](https://github.com/owncloud/ocis/ocis-phoenix/pull/57) ## Details -* Change - Update Phoenix: [#60](https://github.com/owncloud/ocis-phoenix/pull/60) +* Change - Update Phoenix: [#60](https://github.com/owncloud/ocis/ocis-phoenix/pull/60) Updated phoenix from v0.6.0 to v0.7.0 - https://github.com/owncloud/ocis-phoenix/pull/60 + https://github.com/owncloud/ocis/ocis-phoenix/pull/60 -* Enhancement - Configuration: [#57](https://github.com/owncloud/ocis-phoenix/pull/57) +* Enhancement - Configuration: [#57](https://github.com/owncloud/ocis/ocis-phoenix/pull/57) Extensions should be responsible of configuring themselves. We use Viper for config loading from default paths. Environment variables **WILL** take precedence over config files. - https://github.com/owncloud/ocis-phoenix/pull/57 + https://github.com/owncloud/ocis/ocis-phoenix/pull/57 # Changelog for [0.2.0] (2020-03-17) The following sections list the changes in ocis-phoenix 0.2.0. -[0.2.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.3.0...v0.2.0 +[0.2.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.3.0...v0.2.0 ## Summary -* Bugfix - Config file value not being read: [#45](https://github.com/owncloud/ocis-phoenix/pull/45) -* Enhancement - Update to Phoenix v0.5.0: [#43](https://github.com/owncloud/ocis-phoenix/issues/43) -* Enhancement - Update to Phoenix v0.6.0: [#53](https://github.com/owncloud/ocis-phoenix/pull/53) +* Bugfix - Config file value not being read: [#45](https://github.com/owncloud/ocis/ocis-phoenix/pull/45) +* Enhancement - Update to Phoenix v0.5.0: [#43](https://github.com/owncloud/ocis/ocis-phoenix/issues/43) +* Enhancement - Update to Phoenix v0.6.0: [#53](https://github.com/owncloud/ocis/ocis-phoenix/pull/53) ## Details -* Bugfix - Config file value not being read: [#45](https://github.com/owncloud/ocis-phoenix/pull/45) +* Bugfix - Config file value not being read: [#45](https://github.com/owncloud/ocis/ocis-phoenix/pull/45) There was a bug in which phoenix config is always set to the default values and the contents of the config file were actually ignored. - https://github.com/owncloud/ocis-phoenix/issues/46 - https://github.com/owncloud/ocis-phoenix/issues/47 - https://github.com/owncloud/ocis-phoenix/pull/45 + https://github.com/owncloud/ocis/ocis-phoenix/issues/46 + https://github.com/owncloud/ocis/ocis-phoenix/issues/47 + https://github.com/owncloud/ocis/ocis-phoenix/pull/45 -* Enhancement - Update to Phoenix v0.5.0: [#43](https://github.com/owncloud/ocis-phoenix/issues/43) +* Enhancement - Update to Phoenix v0.5.0: [#43](https://github.com/owncloud/ocis/ocis-phoenix/issues/43) Use the latest phoenix release - https://github.com/owncloud/ocis-phoenix/issues/43 + https://github.com/owncloud/ocis/ocis-phoenix/issues/43 -* Enhancement - Update to Phoenix v0.6.0: [#53](https://github.com/owncloud/ocis-phoenix/pull/53) +* Enhancement - Update to Phoenix v0.6.0: [#53](https://github.com/owncloud/ocis/ocis-phoenix/pull/53) Use the latest phoenix release - https://github.com/owncloud/ocis-phoenix/pull/53 + https://github.com/owncloud/ocis/ocis-phoenix/pull/53 # Changelog for [0.3.0] (2020-03-17) The following sections list the changes in ocis-phoenix 0.3.0. -[0.3.0]: https://github.com/owncloud/ocis-phoenix/compare/v0.1.0...v0.3.0 +[0.3.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v0.1.0...v0.3.0 ## Summary -* Change - Default to running behind ocis-proxy: [#55](https://github.com/owncloud/ocis-phoenix/pull/55) +* Change - Default to running behind ocis-proxy: [#55](https://github.com/owncloud/ocis/ocis-phoenix/pull/55) ## Details -* Change - Default to running behind ocis-proxy: [#55](https://github.com/owncloud/ocis-phoenix/pull/55) +* Change - Default to running behind ocis-proxy: [#55](https://github.com/owncloud/ocis/ocis-phoenix/pull/55) We changed the default configuration to integrate better with ocis. Clients are supposed to use the ocis-proxy endpoint `https://localhost:9200` - https://github.com/owncloud/ocis-phoenix/pull/55 + https://github.com/owncloud/ocis/ocis-phoenix/pull/55 # Changelog for [0.1.0] (2020-02-03) The following sections list the changes in ocis-phoenix 0.1.0. -[0.1.0]: https://github.com/owncloud/ocis-phoenix/compare/432c57c406a8421a20ba596818d95f816e2ef9c7...v0.1.0 +[0.1.0]: https://github.com/owncloud/ocis/ocis-phoenix/compare/432c57c406a8421a20ba596818d95f816e2ef9c7...v0.1.0 ## Summary -* Change - Initial release of basic version: [#3](https://github.com/owncloud/ocis-phoenix/issues/3) +* Change - Initial release of basic version: [#3](https://github.com/owncloud/ocis/ocis-phoenix/issues/3) ## Details -* Change - Initial release of basic version: [#3](https://github.com/owncloud/ocis-phoenix/issues/3) +* Change - Initial release of basic version: [#3](https://github.com/owncloud/ocis/ocis-phoenix/issues/3) Just prepared an initial basic version to serve Phoenix for the ownCloud Infinite Scale project. It just provides a minimal viable product to demonstrate the microservice pattern. - https://github.com/owncloud/ocis-phoenix/issues/3 + https://github.com/owncloud/ocis/ocis-phoenix/issues/3 diff --git a/phoenix/LICENSE b/ocis-phoenix/LICENSE similarity index 100% rename from phoenix/LICENSE rename to ocis-phoenix/LICENSE diff --git a/phoenix/Makefile b/ocis-phoenix/Makefile similarity index 100% rename from phoenix/Makefile rename to ocis-phoenix/Makefile diff --git a/phoenix/README.md b/ocis-phoenix/README.md similarity index 100% rename from phoenix/README.md rename to ocis-phoenix/README.md diff --git a/phoenix/changelog/0.1.0_2020-02-03/initial-release.md b/ocis-phoenix/changelog/0.1.0_2020-02-03/initial-release.md similarity index 80% rename from phoenix/changelog/0.1.0_2020-02-03/initial-release.md rename to ocis-phoenix/changelog/0.1.0_2020-02-03/initial-release.md index cc5709b85..3b324232c 100644 --- a/phoenix/changelog/0.1.0_2020-02-03/initial-release.md +++ b/ocis-phoenix/changelog/0.1.0_2020-02-03/initial-release.md @@ -4,4 +4,4 @@ Just prepared an initial basic version to serve Phoenix for the ownCloud Infinite Scale project. It just provides a minimal viable product to demonstrate the microservice pattern. -https://github.com/owncloud/ocis-phoenix/issues/3 +https://github.com/owncloud/ocis/ocis-phoenix/issues/3 diff --git a/phoenix/changelog/0.10.0_2020-07-17/update-phoenix b/ocis-phoenix/changelog/0.10.0_2020-07-17/update-phoenix similarity index 54% rename from phoenix/changelog/0.10.0_2020-07-17/update-phoenix rename to ocis-phoenix/changelog/0.10.0_2020-07-17/update-phoenix index 3629b699b..319cc655a 100644 --- a/phoenix/changelog/0.10.0_2020-07-17/update-phoenix +++ b/ocis-phoenix/changelog/0.10.0_2020-07-17/update-phoenix @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.12.0 to v0.13.0 -https://github.com/owncloud/ocis-phoenix/pull/72 +https://github.com/owncloud/ocis/ocis-phoenix/pull/72 diff --git a/phoenix/changelog/0.11.0_2020-08-17/exit-on-unresolved-assets.md b/ocis-phoenix/changelog/0.11.0_2020-08-17/exit-on-unresolved-assets.md similarity index 83% rename from phoenix/changelog/0.11.0_2020-08-17/exit-on-unresolved-assets.md rename to ocis-phoenix/changelog/0.11.0_2020-08-17/exit-on-unresolved-assets.md index 75efdea80..1a8711c50 100644 --- a/phoenix/changelog/0.11.0_2020-08-17/exit-on-unresolved-assets.md +++ b/ocis-phoenix/changelog/0.11.0_2020-08-17/exit-on-unresolved-assets.md @@ -6,5 +6,5 @@ than specified. We changed the log level to `Fatal` on non-existing assets. Similar for the web config, it was not failing on service level, but only showing an error in the web ui, wenn the specified config file could not be found. We changed the log level to `Fatal` as well. -https://github.com/owncloud/ocis-phoenix/pull/76 -https://github.com/owncloud/ocis-phoenix/pull/77 +https://github.com/owncloud/ocis/ocis-phoenix/pull/76 +https://github.com/owncloud/ocis/ocis-phoenix/pull/77 diff --git a/phoenix/changelog/0.11.0_2020-08-17/hide-searchbar.md b/ocis-phoenix/changelog/0.11.0_2020-08-17/hide-searchbar.md similarity index 76% rename from phoenix/changelog/0.11.0_2020-08-17/hide-searchbar.md rename to ocis-phoenix/changelog/0.11.0_2020-08-17/hide-searchbar.md index b3d173494..a5b11f496 100644 --- a/phoenix/changelog/0.11.0_2020-08-17/hide-searchbar.md +++ b/ocis-phoenix/changelog/0.11.0_2020-08-17/hide-searchbar.md @@ -3,4 +3,4 @@ Change: hide searchbar by default Since file search is not working at the moment we decided to hide the search bar by default. https://github.com/owncloud/product/issues/116 -https://github.com/owncloud/ocis-phoenix/pull/74 +https://github.com/owncloud/ocis/ocis-phoenix/pull/74 diff --git a/phoenix/changelog/0.11.0_2020-08-17/update-phoenix.md b/ocis-phoenix/changelog/0.11.0_2020-08-17/update-phoenix.md similarity index 54% rename from phoenix/changelog/0.11.0_2020-08-17/update-phoenix.md rename to ocis-phoenix/changelog/0.11.0_2020-08-17/update-phoenix.md index 44d8e0d80..296af4ab8 100644 --- a/phoenix/changelog/0.11.0_2020-08-17/update-phoenix.md +++ b/ocis-phoenix/changelog/0.11.0_2020-08-17/update-phoenix.md @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.13.0 to v0.14.0 -https://github.com/owncloud/ocis-phoenix/pull/78 +https://github.com/owncloud/ocis/ocis-phoenix/pull/78 diff --git a/phoenix/changelog/0.11.0_2020-08-17/use-alpine-latest.md b/ocis-phoenix/changelog/0.11.0_2020-08-17/use-alpine-latest.md similarity index 75% rename from phoenix/changelog/0.11.0_2020-08-17/use-alpine-latest.md rename to ocis-phoenix/changelog/0.11.0_2020-08-17/use-alpine-latest.md index 097097e3a..4d0b3af31 100644 --- a/phoenix/changelog/0.11.0_2020-08-17/use-alpine-latest.md +++ b/ocis-phoenix/changelog/0.11.0_2020-08-17/use-alpine-latest.md @@ -2,4 +2,4 @@ Bugfix: build docker images with alpine:latest instead of alpine:edge ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. -https://github.com/owncloud/ocis-phoenix/pull/73 +https://github.com/owncloud/ocis/ocis-phoenix/pull/73 diff --git a/phoenix/changelog/0.12.0_2020-08-19/enable-external-apps.md b/ocis-phoenix/changelog/0.12.0_2020-08-19/enable-external-apps.md similarity index 75% rename from phoenix/changelog/0.12.0_2020-08-19/enable-external-apps.md rename to ocis-phoenix/changelog/0.12.0_2020-08-19/enable-external-apps.md index 44eaee333..55dee63fb 100644 --- a/phoenix/changelog/0.12.0_2020-08-19/enable-external-apps.md +++ b/ocis-phoenix/changelog/0.12.0_2020-08-19/enable-external-apps.md @@ -2,4 +2,4 @@ Change: enable Settings and Accounts apps by default The default ocis-web config now adds the frontend of ocis-accounts and ocis-settings to the builtin web config. -https://github.com/owncloud/ocis-phoenix/pull/80 +https://github.com/owncloud/ocis/ocis-phoenix/pull/80 diff --git a/phoenix/changelog/0.12.0_2020-08-19/update-phoenix.md b/ocis-phoenix/changelog/0.12.0_2020-08-19/update-phoenix.md similarity index 69% rename from phoenix/changelog/0.12.0_2020-08-19/update-phoenix.md rename to ocis-phoenix/changelog/0.12.0_2020-08-19/update-phoenix.md index 6afe9f119..dc9cd2154 100644 --- a/phoenix/changelog/0.12.0_2020-08-19/update-phoenix.md +++ b/ocis-phoenix/changelog/0.12.0_2020-08-19/update-phoenix.md @@ -2,5 +2,5 @@ Change: update Phoenix Updated phoenix from v0.14.0 to v0.15.0 -https://github.com/owncloud/ocis-phoenix/pull/79 +https://github.com/owncloud/ocis/ocis-phoenix/pull/79 https://github.com/owncloud/phoenix/releases/tag/v0.15.0 diff --git a/phoenix/changelog/0.13.0_2020-08-25/update-phoenix b/ocis-phoenix/changelog/0.13.0_2020-08-25/update-phoenix similarity index 69% rename from phoenix/changelog/0.13.0_2020-08-25/update-phoenix rename to ocis-phoenix/changelog/0.13.0_2020-08-25/update-phoenix index df971afaa..83ffcb6bb 100644 --- a/phoenix/changelog/0.13.0_2020-08-25/update-phoenix +++ b/ocis-phoenix/changelog/0.13.0_2020-08-25/update-phoenix @@ -2,5 +2,5 @@ Change: update Phoenix Updated phoenix from v0.15.0 to v0.16.0 -https://github.com/owncloud/ocis-phoenix/pull/81 +https://github.com/owncloud/ocis/ocis-phoenix/pull/81 https://github.com/owncloud/phoenix/releases/tag/v0.16.0 diff --git a/phoenix/changelog/0.2.0_2020-03-17/config-file-parsing.md b/ocis-phoenix/changelog/0.2.0_2020-03-17/config-file-parsing.md similarity index 51% rename from phoenix/changelog/0.2.0_2020-03-17/config-file-parsing.md rename to ocis-phoenix/changelog/0.2.0_2020-03-17/config-file-parsing.md index 03d042ecc..1ae9b9dc2 100644 --- a/phoenix/changelog/0.2.0_2020-03-17/config-file-parsing.md +++ b/ocis-phoenix/changelog/0.2.0_2020-03-17/config-file-parsing.md @@ -2,6 +2,6 @@ Bugfix: Config file value not being read There was a bug in which phoenix config is always set to the default values and the contents of the config file were actually ignored. -https://github.com/owncloud/ocis-phoenix/pull/45 -https://github.com/owncloud/ocis-phoenix/issues/46 -https://github.com/owncloud/ocis-phoenix/issues/47 +https://github.com/owncloud/ocis/ocis-phoenix/pull/45 +https://github.com/owncloud/ocis/ocis-phoenix/issues/46 +https://github.com/owncloud/ocis/ocis-phoenix/issues/47 diff --git a/phoenix/changelog/0.2.0_2020-03-17/issue-43.md b/ocis-phoenix/changelog/0.2.0_2020-03-17/issue-43.md similarity index 55% rename from phoenix/changelog/0.2.0_2020-03-17/issue-43.md rename to ocis-phoenix/changelog/0.2.0_2020-03-17/issue-43.md index 24bded9f3..7a85823f2 100644 --- a/phoenix/changelog/0.2.0_2020-03-17/issue-43.md +++ b/ocis-phoenix/changelog/0.2.0_2020-03-17/issue-43.md @@ -2,4 +2,4 @@ Enhancement: update to Phoenix v0.5.0 Use the latest phoenix release -https://github.com/owncloud/ocis-phoenix/issues/43 +https://github.com/owncloud/ocis/ocis-phoenix/issues/43 diff --git a/phoenix/changelog/0.2.0_2020-03-17/phoenix-0.6.0 b/ocis-phoenix/changelog/0.2.0_2020-03-17/phoenix-0.6.0 similarity index 56% rename from phoenix/changelog/0.2.0_2020-03-17/phoenix-0.6.0 rename to ocis-phoenix/changelog/0.2.0_2020-03-17/phoenix-0.6.0 index 8462706e8..cc6f69ca2 100644 --- a/phoenix/changelog/0.2.0_2020-03-17/phoenix-0.6.0 +++ b/ocis-phoenix/changelog/0.2.0_2020-03-17/phoenix-0.6.0 @@ -2,4 +2,4 @@ Enhancement: update to Phoenix v0.6.0 Use the latest phoenix release -https://github.com/owncloud/ocis-phoenix/pull/53 \ No newline at end of file +https://github.com/owncloud/ocis/ocis-phoenix/pull/53 diff --git a/phoenix/changelog/0.3.0_2020-03-17/new-ocis-config.md b/ocis-phoenix/changelog/0.3.0_2020-03-17/new-ocis-config.md similarity index 78% rename from phoenix/changelog/0.3.0_2020-03-17/new-ocis-config.md rename to ocis-phoenix/changelog/0.3.0_2020-03-17/new-ocis-config.md index c997b4aae..e505c2784 100644 --- a/phoenix/changelog/0.3.0_2020-03-17/new-ocis-config.md +++ b/ocis-phoenix/changelog/0.3.0_2020-03-17/new-ocis-config.md @@ -4,4 +4,4 @@ We changed the default configuration to integrate better with ocis. Clients are supposed to use the ocis-proxy endpoint `https://localhost:9200` -https://github.com/owncloud/ocis-phoenix/pull/55 +https://github.com/owncloud/ocis/ocis-phoenix/pull/55 diff --git a/phoenix/changelog/0.4.0_2020-03-31/config.md b/ocis-phoenix/changelog/0.4.0_2020-03-31/config.md similarity index 79% rename from phoenix/changelog/0.4.0_2020-03-31/config.md rename to ocis-phoenix/changelog/0.4.0_2020-03-31/config.md index f6afe0dc5..6a0a204a7 100644 --- a/phoenix/changelog/0.4.0_2020-03-31/config.md +++ b/ocis-phoenix/changelog/0.4.0_2020-03-31/config.md @@ -2,4 +2,4 @@ Enhancement: Configuration Extensions should be responsible of configuring themselves. We use Viper for config loading from default paths. Environment variables **WILL** take precedence over config files. -https://github.com/owncloud/ocis-phoenix/pull/57 +https://github.com/owncloud/ocis/ocis-phoenix/pull/57 diff --git a/phoenix/changelog/0.4.0_2020-03-31/update-phoenix b/ocis-phoenix/changelog/0.4.0_2020-03-31/update-phoenix similarity index 53% rename from phoenix/changelog/0.4.0_2020-03-31/update-phoenix rename to ocis-phoenix/changelog/0.4.0_2020-03-31/update-phoenix index 03f3ba86a..b35315348 100644 --- a/phoenix/changelog/0.4.0_2020-03-31/update-phoenix +++ b/ocis-phoenix/changelog/0.4.0_2020-03-31/update-phoenix @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.6.0 to v0.7.0 -https://github.com/owncloud/ocis-phoenix/pull/60 \ No newline at end of file +https://github.com/owncloud/ocis/ocis-phoenix/pull/60 diff --git a/phoenix/changelog/0.4.1_2020-04-01/fix-tag b/ocis-phoenix/changelog/0.4.1_2020-04-01/fix-tag similarity index 69% rename from phoenix/changelog/0.4.1_2020-04-01/fix-tag rename to ocis-phoenix/changelog/0.4.1_2020-04-01/fix-tag index 17bc96d1a..0a9cc9b3a 100644 --- a/phoenix/changelog/0.4.1_2020-04-01/fix-tag +++ b/ocis-phoenix/changelog/0.4.1_2020-04-01/fix-tag @@ -2,4 +2,4 @@ Bugfix: Create a new tag to fix v0.4.0 Release v0.4.0 is using the wrong assets. We fixed that by creating a new release. -https://github.com/owncloud/ocis-phoenix/pull/62 \ No newline at end of file +https://github.com/owncloud/ocis/ocis-phoenix/pull/62 diff --git a/phoenix/changelog/0.5.0_2020-04-14/update-phoenix b/ocis-phoenix/changelog/0.5.0_2020-04-14/update-phoenix similarity index 53% rename from phoenix/changelog/0.5.0_2020-04-14/update-phoenix rename to ocis-phoenix/changelog/0.5.0_2020-04-14/update-phoenix index d0fd0512d..9d108cf12 100644 --- a/phoenix/changelog/0.5.0_2020-04-14/update-phoenix +++ b/ocis-phoenix/changelog/0.5.0_2020-04-14/update-phoenix @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.7.0 to v0.8.0 -https://github.com/owncloud/ocis-phoenix/pull/63 \ No newline at end of file +https://github.com/owncloud/ocis/ocis-phoenix/pull/63 diff --git a/phoenix/changelog/0.6.0_2020-04-28/update-phoenix b/ocis-phoenix/changelog/0.6.0_2020-04-28/update-phoenix similarity index 53% rename from phoenix/changelog/0.6.0_2020-04-28/update-phoenix rename to ocis-phoenix/changelog/0.6.0_2020-04-28/update-phoenix index f47d95385..24b92e6c3 100644 --- a/phoenix/changelog/0.6.0_2020-04-28/update-phoenix +++ b/ocis-phoenix/changelog/0.6.0_2020-04-28/update-phoenix @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.8.0 to v0.9.0 -https://github.com/owncloud/ocis-phoenix/pull/65 \ No newline at end of file +https://github.com/owncloud/ocis/ocis-phoenix/pull/65 diff --git a/phoenix/changelog/0.7.0_2020-05-26/update-phoenix b/ocis-phoenix/changelog/0.7.0_2020-05-26/update-phoenix similarity index 54% rename from phoenix/changelog/0.7.0_2020-05-26/update-phoenix rename to ocis-phoenix/changelog/0.7.0_2020-05-26/update-phoenix index 241414ed4..4916ec3b7 100644 --- a/phoenix/changelog/0.7.0_2020-05-26/update-phoenix +++ b/ocis-phoenix/changelog/0.7.0_2020-05-26/update-phoenix @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.9.0 to v0.10.0 -https://github.com/owncloud/ocis-phoenix/pull/66 +https://github.com/owncloud/ocis/ocis-phoenix/pull/66 diff --git a/phoenix/changelog/0.8.0_2020-06-26/update-phoenix b/ocis-phoenix/changelog/0.8.0_2020-06-26/update-phoenix similarity index 54% rename from phoenix/changelog/0.8.0_2020-06-26/update-phoenix rename to ocis-phoenix/changelog/0.8.0_2020-06-26/update-phoenix index 40dcbba3d..451c271c1 100644 --- a/phoenix/changelog/0.8.0_2020-06-26/update-phoenix +++ b/ocis-phoenix/changelog/0.8.0_2020-06-26/update-phoenix @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.10.0 to v0.11.0 -https://github.com/owncloud/ocis-phoenix/pull/67 +https://github.com/owncloud/ocis/ocis-phoenix/pull/67 diff --git a/phoenix/changelog/0.8.1_2020-06-29/update-phoenix b/ocis-phoenix/changelog/0.8.1_2020-06-29/update-phoenix similarity index 54% rename from phoenix/changelog/0.8.1_2020-06-29/update-phoenix rename to ocis-phoenix/changelog/0.8.1_2020-06-29/update-phoenix index 87f2c1f0c..aa7d5ac12 100644 --- a/phoenix/changelog/0.8.1_2020-06-29/update-phoenix +++ b/ocis-phoenix/changelog/0.8.1_2020-06-29/update-phoenix @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.11.0 to v0.11.1 -https://github.com/owncloud/ocis-phoenix/pull/68 +https://github.com/owncloud/ocis/ocis-phoenix/pull/68 diff --git a/phoenix/changelog/0.9.0_2020-07-10/add-silentrefresh-middleware b/ocis-phoenix/changelog/0.9.0_2020-07-10/add-silentrefresh-middleware similarity index 79% rename from phoenix/changelog/0.9.0_2020-07-10/add-silentrefresh-middleware rename to ocis-phoenix/changelog/0.9.0_2020-07-10/add-silentrefresh-middleware index a7bf11377..9e8d5de11 100644 --- a/phoenix/changelog/0.9.0_2020-07-10/add-silentrefresh-middleware +++ b/ocis-phoenix/changelog/0.9.0_2020-07-10/add-silentrefresh-middleware @@ -3,4 +3,4 @@ Bugfix: allow silent refresh of access token Sets the `X-Frame-Options` header to `SAMEORIGIN` so the oidc client can refresh the token in an iframe. https://github.com/owncloud/ocis-konnectd/issues/69 -https://github.com/owncloud/ocis-phoenix/pull/69 +https://github.com/owncloud/ocis/ocis-phoenix/pull/69 diff --git a/phoenix/changelog/0.9.0_2020-07-10/update-phoenix b/ocis-phoenix/changelog/0.9.0_2020-07-10/update-phoenix similarity index 54% rename from phoenix/changelog/0.9.0_2020-07-10/update-phoenix rename to ocis-phoenix/changelog/0.9.0_2020-07-10/update-phoenix index c3251d93e..3f88bb074 100644 --- a/phoenix/changelog/0.9.0_2020-07-10/update-phoenix +++ b/ocis-phoenix/changelog/0.9.0_2020-07-10/update-phoenix @@ -2,4 +2,4 @@ Change: update Phoenix Updated phoenix from v0.11.1 to v0.12.0 -https://github.com/owncloud/ocis-phoenix/pull/70 +https://github.com/owncloud/ocis/ocis-phoenix/pull/70 diff --git a/phoenix/changelog/CHANGELOG.tmpl b/ocis-phoenix/changelog/CHANGELOG.tmpl similarity index 77% rename from phoenix/changelog/CHANGELOG.tmpl rename to ocis-phoenix/changelog/CHANGELOG.tmpl index a9057e757..6ef9e65a0 100644 --- a/phoenix/changelog/CHANGELOG.tmpl +++ b/ocis-phoenix/changelog/CHANGELOG.tmpl @@ -10,17 +10,17 @@ The following sections list the changes in ocis-phoenix {{ .Version }}. {{ if ne (len $allVersions) $next -}} {{ $previousVersion := (index $allVersions $next).Version -}} {{ if eq .Version "unreleased" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-phoenix/compare/v{{ $previousVersion }}...master +[{{ .Version }}]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v{{ $previousVersion }}...master {{ else -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-phoenix/compare/v{{ $previousVersion }}...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/ocis-phoenix/compare/v{{ $previousVersion }}...v{{ .Version }} {{ end -}} {{ end -}} {{- /* last version managed by calens, end of the loop */ -}} {{ if eq .Version "0.1.0" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-phoenix/compare/432c57c406a8421a20ba596818d95f816e2ef9c7...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/ocis-phoenix/compare/432c57c406a8421a20ba596818d95f816e2ef9c7...v{{ .Version }} {{ end -}} {{ else -}} diff --git a/phoenix/changelog/README.md b/ocis-phoenix/changelog/README.md similarity index 100% rename from phoenix/changelog/README.md rename to ocis-phoenix/changelog/README.md diff --git a/phoenix/changelog/TEMPLATE b/ocis-phoenix/changelog/TEMPLATE similarity index 77% rename from phoenix/changelog/TEMPLATE rename to ocis-phoenix/changelog/TEMPLATE index 479f42b3b..151141702 100644 --- a/phoenix/changelog/TEMPLATE +++ b/ocis-phoenix/changelog/TEMPLATE @@ -7,5 +7,5 @@ The text in the paragraphs is written in past tense. The last section is a list of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID, in case there aren't any issue links) is used as the primary ID. -https://github.com/owncloud/ocis-phoenix/issues/1234 -https://github.com/owncloud/ocis-phoenix/pull/55555 +https://github.com/owncloud/ocis/ocis-phoenix/issues/1234 +https://github.com/owncloud/ocis/ocis-phoenix/pull/55555 diff --git a/phoenix/changelog/unreleased/.keep b/ocis-phoenix/changelog/unreleased/.keep similarity index 100% rename from phoenix/changelog/unreleased/.keep rename to ocis-phoenix/changelog/unreleased/.keep diff --git a/phoenix/changelog/unreleased/fix-external-app-urls b/ocis-phoenix/changelog/unreleased/fix-external-app-urls similarity index 79% rename from phoenix/changelog/unreleased/fix-external-app-urls rename to ocis-phoenix/changelog/unreleased/fix-external-app-urls index 4d5fbef32..72c830688 100644 --- a/phoenix/changelog/unreleased/fix-external-app-urls +++ b/ocis-phoenix/changelog/unreleased/fix-external-app-urls @@ -3,4 +3,4 @@ Bugfix: Fix external app URLs The URLs for the default set of external apps was hardcoded to localhost:9200. We fixed that by using relative paths instead. https://github.com/owncloud/product/issues/218 -https://github.com/owncloud/ocis-phoenix/pull/83 +https://github.com/owncloud/ocis/ocis-phoenix/pull/83 diff --git a/phoenix/changelog/unreleased/remove-pdf-viewer.md b/ocis-phoenix/changelog/unreleased/remove-pdf-viewer.md similarity index 79% rename from phoenix/changelog/unreleased/remove-pdf-viewer.md rename to ocis-phoenix/changelog/unreleased/remove-pdf-viewer.md index 8de2cebb3..50a1420af 100644 --- a/phoenix/changelog/unreleased/remove-pdf-viewer.md +++ b/ocis-phoenix/changelog/unreleased/remove-pdf-viewer.md @@ -2,4 +2,4 @@ Change: Remove pdf-viewer from default apps oCIS-web doesn't have a dedicated pdf-viewer app anymore but instead uses the default browser behaviour for PDFs. We removed pdf-viewer from the set of default apps. -https://github.com/owncloud/ocis-phoenix/pull/85 +https://github.com/owncloud/ocis/ocis-phoenix/pull/85 diff --git a/phoenix/cmd/ocis-phoenix/main.go b/ocis-phoenix/cmd/ocis-phoenix/main.go similarity index 67% rename from phoenix/cmd/ocis-phoenix/main.go rename to ocis-phoenix/cmd/ocis-phoenix/main.go index 9adcd5005..7d0e3d52b 100644 --- a/phoenix/cmd/ocis-phoenix/main.go +++ b/ocis-phoenix/cmd/ocis-phoenix/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-phoenix/pkg/command" + "github.com/owncloud/ocis/ocis-phoenix/pkg/command" ) func main() { diff --git a/phoenix/config/example.json b/ocis-phoenix/config/example.json similarity index 100% rename from phoenix/config/example.json rename to ocis-phoenix/config/example.json diff --git a/phoenix/config/example.yml b/ocis-phoenix/config/example.yml similarity index 100% rename from phoenix/config/example.yml rename to ocis-phoenix/config/example.yml diff --git a/phoenix/docker/Dockerfile.linux.amd64 b/ocis-phoenix/docker/Dockerfile.linux.amd64 similarity index 100% rename from phoenix/docker/Dockerfile.linux.amd64 rename to ocis-phoenix/docker/Dockerfile.linux.amd64 diff --git a/phoenix/docker/Dockerfile.linux.arm b/ocis-phoenix/docker/Dockerfile.linux.arm similarity index 100% rename from phoenix/docker/Dockerfile.linux.arm rename to ocis-phoenix/docker/Dockerfile.linux.arm diff --git a/phoenix/docker/Dockerfile.linux.arm64 b/ocis-phoenix/docker/Dockerfile.linux.arm64 similarity index 100% rename from phoenix/docker/Dockerfile.linux.arm64 rename to ocis-phoenix/docker/Dockerfile.linux.arm64 diff --git a/phoenix/docker/manifest.tmpl b/ocis-phoenix/docker/manifest.tmpl similarity index 100% rename from phoenix/docker/manifest.tmpl rename to ocis-phoenix/docker/manifest.tmpl diff --git a/phoenix/docs/_index.md b/ocis-phoenix/docs/_index.md similarity index 100% rename from phoenix/docs/_index.md rename to ocis-phoenix/docs/_index.md diff --git a/phoenix/docs/building.md b/ocis-phoenix/docs/building.md similarity index 100% rename from phoenix/docs/building.md rename to ocis-phoenix/docs/building.md diff --git a/phoenix/docs/getting-started.md b/ocis-phoenix/docs/getting-started.md similarity index 96% rename from phoenix/docs/getting-started.md rename to ocis-phoenix/docs/getting-started.md index 6db3849df..2963fd911 100644 --- a/phoenix/docs/getting-started.md +++ b/ocis-phoenix/docs/getting-started.md @@ -216,7 +216,7 @@ In case you want to render any additional properties in the config.json you can ### 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-phoenix/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/phoenix.yml`, `${HOME}/.ocis/phoenix.yml` or `$(pwd)/config/phoenix.yml`. +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/ocis-phoenix/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/phoenix.yml`, `${HOME}/.ocis/phoenix.yml` or `$(pwd)/config/phoenix.yml`. ## Usage diff --git a/phoenix/docs/license.md b/ocis-phoenix/docs/license.md similarity index 64% rename from phoenix/docs/license.md rename to ocis-phoenix/docs/license.md index adba53c1c..1bcdc02c5 100644 --- a/phoenix/docs/license.md +++ b/ocis-phoenix/docs/license.md @@ -7,4 +7,4 @@ geekdocEditPath: edit/master/docs geekdocFilePath: license.md --- -This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis-phoenix/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. +This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/ocis-phoenix/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/phoenix/docs/releasing.md b/ocis-phoenix/docs/releasing.md similarity index 100% rename from phoenix/docs/releasing.md rename to ocis-phoenix/docs/releasing.md diff --git a/phoenix/go.mod b/ocis-phoenix/go.mod similarity index 65% rename from phoenix/go.mod rename to ocis-phoenix/go.mod index a58ecb6f2..b3e8ffa27 100644 --- a/phoenix/go.mod +++ b/ocis-phoenix/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-phoenix +module github.com/owncloud/ocis/ocis-phoenix go 1.13 @@ -8,20 +8,15 @@ require ( contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/UnnoTed/fileb0x v1.1.4 github.com/go-chi/chi v4.1.2+incompatible - github.com/go-playground/universal-translator v0.17.0 // indirect - github.com/mholt/certmagic v0.9.1 // indirect github.com/micro/cli/v2 v2.1.2 github.com/micro/go-micro v1.18.0 // indirect github.com/oklog/run v1.0.0 github.com/openzipkin/zipkin-go v0.2.2 - github.com/owncloud/ocis-pkg v1.3.0 // indirect github.com/owncloud/ocis-pkg/v2 v2.3.0 github.com/restic/calens v0.2.0 github.com/spf13/viper v1.6.1 go.opencensus.io v0.22.4 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 - google.golang.org/grpc/examples v0.0.0-20200824180931-410880dd7d91 // indirect - gopkg.in/go-playground/validator.v9 v9.31.0 // indirect ) replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 diff --git a/phoenix/go.sum b/ocis-phoenix/go.sum similarity index 99% rename from phoenix/go.sum rename to ocis-phoenix/go.sum index db9077a0e..4bf6c8a66 100644 --- a/phoenix/go.sum +++ b/ocis-phoenix/go.sum @@ -538,6 +538,7 @@ github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= diff --git a/phoenix/pkg/assets/assets.go b/ocis-phoenix/pkg/assets/assets.go similarity index 95% rename from phoenix/pkg/assets/assets.go rename to ocis-phoenix/pkg/assets/assets.go index 2668c5d29..87d272493 100644 --- a/phoenix/pkg/assets/assets.go +++ b/ocis-phoenix/pkg/assets/assets.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/owncloud/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/phoenix/pkg/assets/dummy.go b/ocis-phoenix/pkg/assets/dummy.go similarity index 100% rename from phoenix/pkg/assets/dummy.go rename to ocis-phoenix/pkg/assets/dummy.go diff --git a/phoenix/pkg/assets/embed.go b/ocis-phoenix/pkg/assets/embed.go similarity index 100% rename from phoenix/pkg/assets/embed.go rename to ocis-phoenix/pkg/assets/embed.go diff --git a/phoenix/pkg/assets/embed.yml b/ocis-phoenix/pkg/assets/embed.yml similarity index 100% rename from phoenix/pkg/assets/embed.yml rename to ocis-phoenix/pkg/assets/embed.yml diff --git a/phoenix/pkg/assets/option.go b/ocis-phoenix/pkg/assets/option.go similarity index 93% rename from phoenix/pkg/assets/option.go rename to ocis-phoenix/pkg/assets/option.go index 31319cbe5..1d054aebe 100644 --- a/phoenix/pkg/assets/option.go +++ b/ocis-phoenix/pkg/assets/option.go @@ -1,7 +1,7 @@ package assets import ( - "github.com/owncloud/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/phoenix/pkg/command/health.go b/ocis-phoenix/pkg/command/health.go similarity index 88% rename from phoenix/pkg/command/health.go rename to ocis-phoenix/pkg/command/health.go index 1f6d23cb0..0f25ffc48 100644 --- a/phoenix/pkg/command/health.go +++ b/ocis-phoenix/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-phoenix/pkg/config" - "github.com/owncloud/ocis-phoenix/pkg/flagset" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/phoenix/pkg/command/root.go b/ocis-phoenix/pkg/command/root.go similarity index 92% rename from phoenix/pkg/command/root.go rename to ocis-phoenix/pkg/command/root.go index a18026386..903087e4c 100644 --- a/phoenix/pkg/command/root.go +++ b/ocis-phoenix/pkg/command/root.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-phoenix/pkg/config" - "github.com/owncloud/ocis-phoenix/pkg/flagset" - "github.com/owncloud/ocis-phoenix/pkg/version" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/flagset" + "github.com/owncloud/ocis/ocis-phoenix/pkg/version" "github.com/owncloud/ocis-pkg/v2/log" "github.com/spf13/viper" ) diff --git a/phoenix/pkg/command/server.go b/ocis-phoenix/pkg/command/server.go similarity index 94% rename from phoenix/pkg/command/server.go rename to ocis-phoenix/pkg/command/server.go index e80fd0e9e..56c9d706d 100644 --- a/phoenix/pkg/command/server.go +++ b/ocis-phoenix/pkg/command/server.go @@ -16,11 +16,11 @@ import ( "github.com/oklog/run" openzipkin "github.com/openzipkin/zipkin-go" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" - "github.com/owncloud/ocis-phoenix/pkg/config" - "github.com/owncloud/ocis-phoenix/pkg/flagset" - "github.com/owncloud/ocis-phoenix/pkg/metrics" - "github.com/owncloud/ocis-phoenix/pkg/server/debug" - "github.com/owncloud/ocis-phoenix/pkg/server/http" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/flagset" + "github.com/owncloud/ocis/ocis-phoenix/pkg/metrics" + "github.com/owncloud/ocis/ocis-phoenix/pkg/server/debug" + "github.com/owncloud/ocis/ocis-phoenix/pkg/server/http" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) diff --git a/phoenix/pkg/config/config.go b/ocis-phoenix/pkg/config/config.go similarity index 100% rename from phoenix/pkg/config/config.go rename to ocis-phoenix/pkg/config/config.go diff --git a/phoenix/pkg/flagset/flagset.go b/ocis-phoenix/pkg/flagset/flagset.go similarity index 99% rename from phoenix/pkg/flagset/flagset.go rename to ocis-phoenix/pkg/flagset/flagset.go index 103d53b9d..dc21dae97 100644 --- a/phoenix/pkg/flagset/flagset.go +++ b/ocis-phoenix/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/phoenix/pkg/metrics/metrics.go b/ocis-phoenix/pkg/metrics/metrics.go similarity index 100% rename from phoenix/pkg/metrics/metrics.go rename to ocis-phoenix/pkg/metrics/metrics.go diff --git a/phoenix/pkg/middleware/silentrefresh.go b/ocis-phoenix/pkg/middleware/silentrefresh.go similarity index 100% rename from phoenix/pkg/middleware/silentrefresh.go rename to ocis-phoenix/pkg/middleware/silentrefresh.go diff --git a/phoenix/pkg/server/debug/option.go b/ocis-phoenix/pkg/server/debug/option.go similarity index 94% rename from phoenix/pkg/server/debug/option.go rename to ocis-phoenix/pkg/server/debug/option.go index e2d608de5..ab4041450 100644 --- a/phoenix/pkg/server/debug/option.go +++ b/ocis-phoenix/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/owncloud/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/phoenix/pkg/server/debug/server.go b/ocis-phoenix/pkg/server/debug/server.go similarity index 92% rename from phoenix/pkg/server/debug/server.go rename to ocis-phoenix/pkg/server/debug/server.go index 9962cae55..d16eb48dc 100644 --- a/phoenix/pkg/server/debug/server.go +++ b/ocis-phoenix/pkg/server/debug/server.go @@ -4,8 +4,8 @@ import ( "io" "net/http" - "github.com/owncloud/ocis-phoenix/pkg/config" - "github.com/owncloud/ocis-phoenix/pkg/version" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/version" "github.com/owncloud/ocis-pkg/v2/service/debug" ) diff --git a/phoenix/pkg/server/http/option.go b/ocis-phoenix/pkg/server/http/option.go similarity index 93% rename from phoenix/pkg/server/http/option.go rename to ocis-phoenix/pkg/server/http/option.go index f644a8831..4dcd55f52 100644 --- a/phoenix/pkg/server/http/option.go +++ b/ocis-phoenix/pkg/server/http/option.go @@ -4,8 +4,8 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-phoenix/pkg/config" - "github.com/owncloud/ocis-phoenix/pkg/metrics" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/metrics" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/phoenix/pkg/server/http/server.go b/ocis-phoenix/pkg/server/http/server.go similarity index 86% rename from phoenix/pkg/server/http/server.go rename to ocis-phoenix/pkg/server/http/server.go index e92af475f..4d3219113 100644 --- a/phoenix/pkg/server/http/server.go +++ b/ocis-phoenix/pkg/server/http/server.go @@ -1,9 +1,9 @@ package http import ( - phoenixmid "github.com/owncloud/ocis-phoenix/pkg/middleware" - svc "github.com/owncloud/ocis-phoenix/pkg/service/v0" - "github.com/owncloud/ocis-phoenix/pkg/version" + phoenixmid "github.com/owncloud/ocis/ocis-phoenix/pkg/middleware" + svc "github.com/owncloud/ocis/ocis-phoenix/pkg/service/v0" + "github.com/owncloud/ocis/ocis-phoenix/pkg/version" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/service/http" ) diff --git a/phoenix/pkg/service/v0/instrument.go b/ocis-phoenix/pkg/service/v0/instrument.go similarity index 91% rename from phoenix/pkg/service/v0/instrument.go rename to ocis-phoenix/pkg/service/v0/instrument.go index 281ec1257..a0316cbfe 100644 --- a/phoenix/pkg/service/v0/instrument.go +++ b/ocis-phoenix/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-phoenix/pkg/metrics" + "github.com/owncloud/ocis/ocis-phoenix/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/phoenix/pkg/service/v0/logging.go b/ocis-phoenix/pkg/service/v0/logging.go similarity index 100% rename from phoenix/pkg/service/v0/logging.go rename to ocis-phoenix/pkg/service/v0/logging.go diff --git a/phoenix/pkg/service/v0/option.go b/ocis-phoenix/pkg/service/v0/option.go similarity index 94% rename from phoenix/pkg/service/v0/option.go rename to ocis-phoenix/pkg/service/v0/option.go index 2fe103ef3..3621925e1 100644 --- a/phoenix/pkg/service/v0/option.go +++ b/ocis-phoenix/pkg/service/v0/option.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/phoenix/pkg/service/v0/service.go b/ocis-phoenix/pkg/service/v0/service.go similarity index 97% rename from phoenix/pkg/service/v0/service.go rename to ocis-phoenix/pkg/service/v0/service.go index 6ff9853a6..ddd3b8f40 100644 --- a/phoenix/pkg/service/v0/service.go +++ b/ocis-phoenix/pkg/service/v0/service.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/go-chi/chi" - "github.com/owncloud/ocis-phoenix/pkg/assets" - "github.com/owncloud/ocis-phoenix/pkg/config" + "github.com/owncloud/ocis/ocis-phoenix/pkg/assets" + "github.com/owncloud/ocis/ocis-phoenix/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/phoenix/pkg/service/v0/tracing.go b/ocis-phoenix/pkg/service/v0/tracing.go similarity index 100% rename from phoenix/pkg/service/v0/tracing.go rename to ocis-phoenix/pkg/service/v0/tracing.go diff --git a/phoenix/pkg/version/version.go b/ocis-phoenix/pkg/version/version.go similarity index 100% rename from phoenix/pkg/version/version.go rename to ocis-phoenix/pkg/version/version.go diff --git a/phoenix/reflex.conf b/ocis-phoenix/reflex.conf similarity index 100% rename from phoenix/reflex.conf rename to ocis-phoenix/reflex.conf diff --git a/phoenix/tools.go b/ocis-phoenix/tools.go similarity index 100% rename from phoenix/tools.go rename to ocis-phoenix/tools.go diff --git a/phoenix/config/.gitignore b/phoenix/config/.gitignore deleted file mode 100644 index 90b39ab06..000000000 --- a/phoenix/config/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!example.json -!example.yml