From 9a2cc35ecfd59e335da98d6a9c889797b00c8d0f Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Thu, 5 Sep 2019 12:06:09 +0200 Subject: [PATCH] Update files for new ocis naming --- .github/settings.yml | 4 ++-- Makefile | 2 +- README.md | 20 ++++++++++---------- changelog/TEMPLATE | 4 ++-- changelog/unreleased/initial-release.md | 2 +- cmd/{reva-webdav => ocis-webdav}/main.go | 2 +- docker/Dockerfile.linux.amd64 | 4 ++-- docker/Dockerfile.linux.arm | 4 ++-- docker/Dockerfile.linux.arm64 | 4 ++-- docker/manifest.tmpl | 8 ++++---- go.mod | 2 +- pkg/command/command.go | 12 ++++++------ 12 files changed, 34 insertions(+), 34 deletions(-) rename cmd/{reva-webdav => ocis-webdav}/main.go (70%) diff --git a/.github/settings.yml b/.github/settings.yml index cde53dc3e50..d52a3a7c28b 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,6 +1,6 @@ repository: - name: reva-webdav - description: :atom_symbol: Service to serve webdav for reva + name: ocis-webdav + description: :atom_symbol: Service to serve WebDAV for Reva/oCIS homepage: topics: reva, ocis diff --git a/Makefile b/Makefile index 0d29994c98b..4093689d892 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL := bash -NAME := reva-webdav +NAME := ocis-webdav IMPORT := github.com/owncloud/$(NAME) BIN := bin DIST := dist diff --git a/README.md b/README.md index c40846a0a70..31630628891 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,29 @@ -# Reva: WebDAV +# ownCloud Infinit Scale: WebDAV -[![Build Status](https://cloud.drone.io/api/badges/owncloud/reva-webdav/status.svg)](https://cloud.drone.io/owncloud/reva-webdav) +[![Build Status](https://cloud.drone.io/api/badges/owncloud/ocis-webdav/status.svg)](https://cloud.drone.io/owncloud/ocis-webdav) [![Gitter chat](https://badges.gitter.im/cs3org/reva.svg)](https://gitter.im/cs3org/reva) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/afe89eb0894848c5b67dc0343afd1df9)](https://www.codacy.com/app/owncloud/reva-webdav?utm_source=github.com&utm_medium=referral&utm_content=owncloud/reva-webdav&utm_campaign=Badge_Grade) -[![Go Doc](https://godoc.org/github.com/owncloud/reva-webdav?status.svg)](http://godoc.org/github.com/owncloud/reva-webdav) -[![Go Report](http://goreportcard.com/badge/github.com/owncloud/reva-webdav)](http://goreportcard.com/report/github.com/owncloud/reva-webdav) -[![](https://images.microbadger.com/badges/image/owncloud/reva-webdav.svg)](http://microbadger.com/images/owncloud/reva-webdav "Get your own image badge on microbadger.com") +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0913fcc866a344b587bb867fcec5b848)](https://www.codacy.com/app/owncloud/ocis-webdav?utm_source=github.com&utm_medium=referral&utm_content=owncloud/ocis-webdav&utm_campaign=Badge_Grade) +[![Go Doc](https://godoc.org/github.com/owncloud/ocis-webdav?status.svg)](http://godoc.org/github.com/owncloud/ocis-webdav) +[![Go Report](http://goreportcard.com/badge/github.com/owncloud/ocis-webdav)](http://goreportcard.com/report/github.com/owncloud/ocis-webdav) +[![](https://images.microbadger.com/badges/image/owncloud/ocis-webdav.svg)](http://microbadger.com/images/owncloud/ocis-webdav "Get your own image badge on microbadger.com") **This project is under heavy development, it's not in a working state yet!** ## Install -You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/reva/webdav/). +You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/ocis/webdav/). ## Development Make sure you have a working Go environment, for further reference or a guide take a look at the [install instructions](http://golang.org/doc/install.html). This project requires Go >= v1.11. ```console -git clone https://github.com/owncloud/reva-webdav.git -cd reva-webdav +git clone https://github.com/owncloud/ocis-webdav.git +cd ocis-webdav make generate build -./bin/reva-webdav -h +./bin/ocis-webdav -h ``` ## Security diff --git a/changelog/TEMPLATE b/changelog/TEMPLATE index f90015a9884..c6dd91433ae 100644 --- a/changelog/TEMPLATE +++ b/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/reva-webdav/issues/1234 -https://github.com/owncloud/reva-webdav/pull/55555 +https://github.com/owncloud/ocis-webdav/issues/1234 +https://github.com/owncloud/ocis-webdav/pull/55555 diff --git a/changelog/unreleased/initial-release.md b/changelog/unreleased/initial-release.md index a8ec0d814a0..87b211ecf32 100644 --- a/changelog/unreleased/initial-release.md +++ b/changelog/unreleased/initial-release.md @@ -4,4 +4,4 @@ Just prepared an initial basic version to serve webdav for the ownCloud Infinite Scale project. It just provides a minimal viable product to demonstrate the microservice pattern. -https://github.com/owncloud/reva-webdav/issues/1 +https://github.com/owncloud/ocis-webdav/issues/1 diff --git a/cmd/reva-webdav/main.go b/cmd/ocis-webdav/main.go similarity index 70% rename from cmd/reva-webdav/main.go rename to cmd/ocis-webdav/main.go index aab668a04b3..0a0d19e55b2 100644 --- a/cmd/reva-webdav/main.go +++ b/cmd/ocis-webdav/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/reva-webdav/pkg/command" + "github.com/owncloud/ocis-webdav/pkg/command" ) func main() { diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index ca873f755f0..cc8094a1967 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH " \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0" -ENTRYPOINT ["/usr/bin/reva-webdav"] +ENTRYPOINT ["/usr/bin/ocis-webdav"] CMD ["server"] -COPY bin/reva-webdav /usr/bin/reva-webdav +COPY bin/ocis-webdav /usr/bin/ocis-webdav diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 54f4bd7fb8a..17165172001 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH " \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0" -ENTRYPOINT ["/usr/bin/reva-webdav"] +ENTRYPOINT ["/usr/bin/ocis-webdav"] CMD ["server"] -COPY bin/reva-webdav /usr/bin/reva-webdav +COPY bin/ocis-webdav /usr/bin/ocis-webdav diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 20830938ab6..3e4479cc0b7 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH " \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0" -ENTRYPOINT ["/usr/bin/reva-webdav"] +ENTRYPOINT ["/usr/bin/ocis-webdav"] CMD ["server"] -COPY bin/reva-webdav /usr/bin/reva-webdav +COPY bin/ocis-webdav /usr/bin/ocis-webdav diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl index 18ce39f8d90..63942c97ecd 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -1,4 +1,4 @@ -image: owncloud/reva-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: owncloud/ocis-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -6,16 +6,16 @@ tags: {{/each}} {{/if}} manifests: - - image: owncloud/reva-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + - image: owncloud/ocis-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - image: owncloud/reva-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + - image: owncloud/ocis-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 platform: architecture: arm64 variant: v8 os: linux - - image: owncloud/reva-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm + - image: owncloud/ocis-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm platform: architecture: arm variant: v6 diff --git a/go.mod b/go.mod index 59b3fca0f98..8963ccce2c8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/reva-webdav +module github.com/owncloud/ocis-webdav go 1.12 diff --git a/pkg/command/command.go b/pkg/command/command.go index f452ae7de94..e50340d1b9e 100644 --- a/pkg/command/command.go +++ b/pkg/command/command.go @@ -4,17 +4,17 @@ import ( "os" "strings" - "github.com/owncloud/reva-webdav/pkg/version" + "github.com/owncloud/ocis-webdav/pkg/version" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" ) -// Root is the entry point for the reva-webdav command. +// Root is the entry point for the ocis-webdav command. func Root() *cobra.Command { cmd := &cobra.Command{ - Use: "reva-webdav", + Use: "ocis-webdav", Short: "Reva service for webdav", Long: ``, Version: version.String, @@ -74,10 +74,10 @@ func setupLogger() { } func setupConfig() { - viper.SetConfigName("phoenix") + viper.SetConfigName("webdav") - viper.AddConfigPath("/etc/reva") - viper.AddConfigPath("$HOME/.reva") + viper.AddConfigPath("/etc/ocis") + viper.AddConfigPath("$HOME/.ocis") viper.AddConfigPath("./config") if err := viper.ReadInConfig(); err != nil {