mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-20 11:30:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some more naming fixes

Browse Source
This commit is contained in:
André Duffeck
2025-01-21 15:49:40 +01:00
parent 2462b80d95
commit f106e848bf
8 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.adr-dir
View File

@@ -1 +0,0 @@
docs/ocis/adr

26
.vscode/launch.json vendored
View File

@@ -15,14 +15,14 @@
"port": 40000
},
{
"name": "oCIS server",
"name": "OpenCloud server",
"type": "go",
"request": "launch",
"mode": "debug",
"buildFlags": [
// "-tags", "enable_vips"
],
"program": "${workspaceFolder}/ocis/cmd/ocis",
"program": "${workspaceFolder}/opencloud/cmd/opencloud",
"args": ["server"],
"env": {
// log settings for human developers
@@ -49,9 +49,9 @@
"OC_SYSTEM_USER_ID": "some-system-user-id-000-000000000000", // FIXME currently must have the length of a UUID, see reva/pkg/storage/utils/decomposedfs/spaces.go:228
"OC_SYSTEM_USER_API_KEY": "some-system-user-machine-auth-api-key",
// set some hardcoded secrets
"OC_JWT_SECRET": "some-ocis-jwt-secret",
"OC_MACHINE_AUTH_API_KEY": "some-ocis-machine-auth-api-key",
"OC_TRANSFER_SECRET": "some-ocis-transfer-secret",
"OC_JWT_SECRET": "some-opencloud-jwt-secret",
"OC_MACHINE_AUTH_API_KEY": "some-opencloud-machine-auth-api-key",
"OC_TRANSFER_SECRET": "some-opencloud-transfer-secret",
// collaboration
"COLLABORATION_WOPIAPP_SECRET": "some-wopi-secret",
// idm ldap
@@ -77,20 +77,20 @@
}
},
{
"name": "Fed oCIS server",
"name": "Fed OpenCloud server",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/ocis/cmd/ocis/main.go",
"program": "${workspaceFolder}/opencloud/cmd/opencloud/main.go",
"args": ["server"],
"env": {
"WEB_UI_CONFIG_FILE": "${workspaceFolder}/tests/config/local/fed-ocis-web.json",
"WEB_UI_CONFIG_FILE": "${workspaceFolder}/tests/config/local/fed-opencloud-web.json",
"OCM_OCM_PROVIDER_AUTHORIZER_PROVIDERS_FILE": "${workspaceFolder}/tests/config/local/providers.json",
"OCM_OCM_INVITE_MANAGER_INSECURE": "true",
"OCM_OCM_SHARE_PROVIDER_INSECURE": "true",
"OCM_OCM_STORAGE_PROVIDER_INSECURE": "true",
"OC_BASE_DATA_PATH": "${env:HOME}/.ocis-10200",
"OC_CONFIG_DIR": "${env:HOME}/.ocis-10200/config",
"OC_BASE_DATA_PATH": "${env:HOME}/.opencloud-10200",
"OC_CONFIG_DIR": "${env:HOME}/.opencloud-10200/config",
"OC_EVENTS_ENDPOINT": "127.0.0.1:10233",
"OC_LDAP_URI": "ldaps://localhost:10235",
"OC_RUNTIME_PORT": "10250",
@@ -194,9 +194,9 @@
"IDM_ADMIN_PASSWORD": "admin",
"OC_SYSTEM_USER_ID": "some-system-user-id-000-000000000000",
"OC_SYSTEM_USER_API_KEY": "some-system-user-machine-auth-api-key",
"OC_JWT_SECRET": "some-ocis-jwt-secret",
"OC_MACHINE_AUTH_API_KEY": "some-ocis-machine-auth-api-key",
"OC_TRANSFER_SECRET": "some-ocis-transfer-secret",
"OC_JWT_SECRET": "some-opencloud-jwt-secret",
"OC_MACHINE_AUTH_API_KEY": "some-opencloud-machine-auth-api-key",
"OC_TRANSFER_SECRET": "some-opencloud-transfer-secret",
"IDM_SVC_PASSWORD": "some-ldap-idm-password",
"GRAPH_LDAP_BIND_PASSWORD": "some-ldap-idm-password",
"IDM_REVASVC_PASSWORD": "some-ldap-reva-password",

4
deployments/continuous-deployment-config/opencloud_full/master.yml
View File

@@ -7,14 +7,14 @@
initial_ssh_key_names:
- opencloud@drone.opencloud.com
labels:
owner: ocis-team
owner: opencloud-team
for: opencloud-continuous-deployment-examples
rebuild: $REBUILD
rebuild_carry_paths:
- /var/lib/docker/volumes/opencloud_certs
domains:
- "*.ocis.main.opencloud.works"
- "*.cloud.main.opencloud.works"
vars:
ssh_authorized_keys:

14
scripts/create-tree.sh
View File

@@ -38,14 +38,14 @@ create_tree()
fi
}
# creating 20/20 https://cloud.ocis.test/webdav/w20 x d1 folders/w20d1
# creating 420/400 https://cloud.ocis.test/webdav/w20 x d2 folders/w20d2/w20d1
# creating 8420/8000 https://cloud.ocis.test/webdav/w20 x d3 folders/w20d3/w20d2/w20d1
# creating 20/20 https://cloud.opencloud.test/webdav/w20 x d1 folders/w20d1
# creating 420/400 https://cloud.opencloud.test/webdav/w20 x d2 folders/w20d2/w20d1
# creating 8420/8000 https://cloud.opencloud.test/webdav/w20 x d3 folders/w20d3/w20d2/w20d1
# creating 10/10 https://cloud.ocis.test/webdav/w10 x d1 folders/w10d1
# creating 110/100 https://cloud.ocis.test/webdav/w10 x d2 folders/w10d2/w10d1
# creating 1110/1000 https://cloud.ocis.test/webdav/w10 x d3 folders/w10d3/w10d2/w10d1
#creating 11110/10000 https://cloud.ocis.test/webdav/w10 x d4 folders/w10d4/w10d3/w10d2/w10d1
# creating 10/10 https://cloud.opencloud.test/webdav/w10 x d1 folders/w10d1
# creating 110/100 https://cloud.opencloud.test/webdav/w10 x d2 folders/w10d2/w10d1
# creating 1110/1000 https://cloud.opencloud.test/webdav/w10 x d3 folders/w10d3/w10d2/w10d1
#creating 11110/10000 https://cloud.opencloud.test/webdav/w10 x d4 folders/w10d4/w10d3/w10d2/w10d1
# w^d +

2
scripts/zombies.sh
View File

@@ -11,6 +11,6 @@ while [ "$((i <= end))" -ne 0 ]
do
echo "creating zombie $i"
curl -X POST 'https://localhost:9200/ocs/v1.php/cloud/users' -k -u admin:admin -d userid="zombie$i" -d password="zombie" -d email="zombie$i@example.org"
#$DIR/../ocis/bin/ocis accounts add --preferred-name zombie$i --on-premises-sam-account-name zombie$i --mail zombie$i@example.org
#$DIR/../opencloud/bin/opencloud accounts add --preferred-name zombie$i --on-premises-sam-account-name zombie$i --mail zombie$i@example.org
: "$((i = i + 1))"
done

24
services/app-registry/README.md
View File

@@ -61,7 +61,7 @@ Clients, for example OpenCloud Web, need to offer users the available apps to op
**Request example**:
```bash
curl 'https://ocis.test/app/list'
curl 'https://opencloud.test/app/list'
```
**Response example**:
@@ -150,7 +150,7 @@ HTTP status code: 200
**Authentication** (one of them):
- `Authorization` header with OIDC Bearer token for authenticated users or basic auth credentials (if enabled in oCIS)
- `Authorization` header with OIDC Bearer token for authenticated users or basic auth credentials (if enabled in OpenCloud)
- `X-Access-Token` header with a REVA token for authenticated users
**Query parameters**:
@@ -163,9 +163,9 @@ HTTP status code: 200
**Request examples**:
```bash
curl -X POST 'https://ocis.test/app/open-with-web?file_id=ZmlsZTppZAo='
curl -X POST 'https://opencloud.test/app/open-with-web?file_id=ZmlsZTppZAo='
curl -X POST 'https://ocis.test/app/open-with-web?file_id=ZmlsZTppZAo=&app_name=Collabora'
curl -X POST 'https://opencloud.test/app/open-with-web?file_id=ZmlsZTppZAo=&app_name=Collabora'
```
**Response examples**:
@@ -192,7 +192,7 @@ See error cases for [Open a file with the app provider](#open-a-file-with-the-ap
**Authentication** (one of them):
- `Authorization` header with OIDC Bearer token for authenticated users or basic auth credentials (if enabled in oCIS)
- `Authorization` header with OIDC Bearer token for authenticated users or basic auth credentials (if enabled in OpenCloud)
- `Public-Token` header with public link token for public links
- `X-Access-Token` header with a REVA token for authenticated users
@@ -219,15 +219,15 @@ See error cases for [Open a file with the app provider](#open-a-file-with-the-ap
**Request examples**:
```bash
curl -X POST 'https://ocis.test/app/open?file_id=ZmlsZTppZAo='
curl -X POST 'https://opencloud.test/app/open?file_id=ZmlsZTppZAo='
curl -X POST 'https://ocis.test/app/open?file_id=ZmlsZTppZAo=&lang=de'
curl -X POST 'https://opencloud.test/app/open?file_id=ZmlsZTppZAo=&lang=de'
curl -X POST 'https://ocis.test/app/open?file_id=ZmlsZTppZAo=&app_name=Collabora'
curl -X POST 'https://opencloud.test/app/open?file_id=ZmlsZTppZAo=&app_name=Collabora'
curl -X POST 'https://ocis.test/app/open?file_id=ZmlsZTppZAo=&view_mode=read'
curl -X POST 'https://opencloud.test/app/open?file_id=ZmlsZTppZAo=&view_mode=read'
curl -X POST 'https://ocis.test/app/open?file_id=ZmlsZTppZAo=&app_name=Collabora&view_mode=write'
curl -X POST 'https://opencloud.test/app/open?file_id=ZmlsZTppZAo=&app_name=Collabora&view_mode=write'
```
**Response examples**:
@@ -353,7 +353,7 @@ HTTP status code: 200
**Authentication** (one of them):
- `Authorization` header with OIDC Bearer token for authenticated users or basic auth credentials (if enabled in oCIS)
- `Authorization` header with OIDC Bearer token for authenticated users or basic auth credentials (if enabled in OpenCloud)
- `Public-Token` header with public link token for public links
- `X-Access-Token` header with a REVA token for authenticated users
@@ -366,7 +366,7 @@ HTTP status code: 200
**Request examples**:
```bash
curl -X POST 'https://ocis.test/app/new?parent_container_id=c2lkOmNpZAo=&filename=test.odt'
curl -X POST 'https://opencloud.test/app/new?parent_container_id=c2lkOmNpZAo=&filename=test.odt'
```
**Response example**:

4
services/proxy/pkg/proxy/policy/selector.go
View File

@@ -117,7 +117,7 @@ func NewStaticSelector(cfg *config.StaticSelectorConf) Selector {
// }
// },
//
// This selector can be used in migration-scenarios where some users have already migrated from ownCloud10 to OCIS and
// This selector can be used in migration-scenarios where some users have already migrated from ownCloud10 to OpenCloud and
func NewClaimsSelector(cfg *config.ClaimsSelectorConf) Selector {
return func(r *http.Request) (s string, err error) {
@@ -171,7 +171,7 @@ func NewClaimsSelector(cfg *config.ClaimsSelectorConf) Selector {
// }
// },
//
// This selector can be used in migration-scenarios where some users have already migrated from ownCloud10 to OCIS and
// This selector can be used in migration-scenarios where some users have already migrated from ownCloud10 to OpenCloud and
func NewRegexSelector(cfg *config.RegexSelectorConf) Selector {
regexRules := []*regexRule{}
sort.Slice(cfg.MatchesPolicies, func(i, j int) bool {

2
tests/README.md
View File

@@ -19,7 +19,7 @@ Basically we have two sources for feature tests and test suites:
At the moment, both can be applied to OpenCloud.
As a storage backend, we support the oCIS native storage, also called `ocis`. This stores files directly on disk. Along with that we also provide `s3ng` storage driver.
As a storage backend, we support the OpenCloud native storage, also called `ocis`. This stores files directly on disk. Along with that we also provide `s3ng` storage driver.
You can invoke two types of test suite runs: