Skip to content

Commit

Permalink
Change (ocis,OCIS) to oCIS, unify GitHub branding
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalwengerter committed Jan 28, 2021
1 parent 8dd2858 commit d7b1ecb
Show file tree
Hide file tree
Showing 27 changed files with 79 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ For fixing potential security issues please see https://owncloud.org/security/
To make it possible for us to get your change reviewed and merged please carefully fill out the requested information below.
Please note that any kind of change needs first be submitted to the master branch which holds the next version of OCIS.
Please note that any kind of change needs first be submitted to the master branch which holds the next version of oCIS.
Please set the following labels:
Expand Down
10 changes: 5 additions & 5 deletions accounts/pkg/proto/v0/accounts.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions accounts/pkg/proto/v0/accounts.proto
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,13 @@ message Account {

// Indicates whether the account was created as
// - a regular school or work account ("" / emptystring),
// - a local account, fully managed by ocis (LocalAccount), includes synced accounts or
// - a local account, fully managed by oCIS (LocalAccount), includes synced accounts or
// - an external account (Invitation),
// - self-service sign-up using email verification (EmailVerified). Read-only.
string creation_type = 4;

// Represents the identities that can be used to sign in to this account.
// An identity can be provided by OCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account.
// An identity can be provided by oCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account.
// May contain multiple items with the same signInType value. Supports $filter.
repeated Identities identities = 5;

Expand Down Expand Up @@ -321,7 +321,7 @@ message Account {
// null if this object has never been synced from an on-premises directory (default). Read-only
bool on_premises_sync_enabled = 20;

// This property is used to associate an on-premises LDAP user to the ocis account object.
// This property is used to associate an on-premises LDAP user to the oCIS account object.
// This property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.
// Important: The $ and _ characters cannot be used when specifying this property. Supports $filter.
string on_premises_immutable_id = 21;
Expand Down Expand Up @@ -382,7 +382,7 @@ message Account {
}

// Identities Represents an identity used to sign in to a user account.
// An identity can be provided by ocis, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account.
// An identity can be provided by oCIS, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account.
// This enables the user to sign in to the user account with any of those associated identities.
// They are also used to keep a history of old usernames.
message Identities {
Expand Down Expand Up @@ -627,7 +627,7 @@ message Group {
// Returned by default. Read-only. Supports $filter.
bool on_premises_sync_enabled = 20;

// This property is used to associate an on-premises LDAP user to the ocis account object.
// This property is used to associate an on-premises LDAP user to the oCIS account object.
// This property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.
// Important: The $ and _ characters cannot be used when specifying this property. Supports $filter.
string on_premises_immutable_id = 21;
Expand Down
10 changes: 5 additions & 5 deletions accounts/pkg/proto/v0/accounts.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -568,14 +568,14 @@
},
"creation_type": {
"type": "string",
"description": "Indicates whether the account was created as\n- a regular school or work account (\"\" / emptystring),\n- a local account, fully managed by ocis (LocalAccount), includes synced accounts or\n- an external account (Invitation),\n- self-service sign-up using email verification (EmailVerified). Read-only."
"description": "Indicates whether the account was created as\n- a regular school or work account (\"\" / emptystring),\n- a local account, fully managed by oCIS (LocalAccount), includes synced accounts or\n- an external account (Invitation),\n- self-service sign-up using email verification (EmailVerified). Read-only."
},
"identities": {
"type": "array",
"items": {
"$ref": "#/definitions/settingsIdentities"
},
"description": "Represents the identities that can be used to sign in to this account.\nAn identity can be provided by OCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account.\nMay contain multiple items with the same signInType value. Supports $filter."
"description": "Represents the identities that can be used to sign in to this account.\nAn identity can be provided by oCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account.\nMay contain multiple items with the same signInType value. Supports $filter."
},
"display_name": {
"type": "string",
Expand Down Expand Up @@ -631,7 +631,7 @@
},
"on_premises_immutable_id": {
"type": "string",
"description": "This property is used to associate an on-premises LDAP user to the ocis account object.\nThis property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.\nImportant: The $ and _ characters cannot be used when specifying this property. Supports $filter."
"description": "This property is used to associate an on-premises LDAP user to the oCIS account object.\nThis property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.\nImportant: The $ and _ characters cannot be used when specifying this property. Supports $filter."
},
"on_premises_security_identifier": {
"type": "string",
Expand Down Expand Up @@ -815,7 +815,7 @@
},
"on_premises_immutable_id": {
"type": "string",
"description": "This property is used to associate an on-premises LDAP user to the ocis account object.\nThis property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.\nImportant: The $ and _ characters cannot be used when specifying this property. Supports $filter."
"description": "This property is used to associate an on-premises LDAP user to the oCIS account object.\nThis property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.\nImportant: The $ and _ characters cannot be used when specifying this property. Supports $filter."
},
"on_premises_security_identifier": {
"type": "string",
Expand Down Expand Up @@ -866,7 +866,7 @@
"description": "Specifies the unique identifier assigned to the user by the issuer. The combination of *issuer* and *issuerAssignedId* must be unique within the organization. Represents the sign-in name for the user, when signInType is set to emailAddress or userName (also known as local accounts).\nWhen *signInType* is set to:\n* `emailAddress`, (or starts with `emailAddress` like `emailAddress1`) *issuerAssignedId* must be a valid email address\n* `userName`, issuer_assigned_id must be a valid local part of an email address\nSupports $filter. 512 character limit."
}
},
"description": "Identities Represents an identity used to sign in to a user account.\nAn identity can be provided by ocis, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account.\nThis enables the user to sign in to the user account with any of those associated identities.\nThey are also used to keep a history of old usernames."
"description": "Identities Represents an identity used to sign in to a user account.\nAn identity can be provided by oCIS, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account.\nThis enables the user to sign in to the user account with any of those associated identities.\nThey are also used to keep a history of old usernames."
},
"settingsListAccountsRequest": {
"type": "object",
Expand Down
4 changes: 2 additions & 2 deletions changelog/1.0.0_2020-12-17/user-agent-challenge-lock-in.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: reva, proxy

We now comply with HTTP spec by adding Www-Authenticate headers on every `401` request. Furthermore, we not only take care of such a thing at the Proxy but also Reva will take care of it. In addition, we now are able to lock-in a set of User-Agent to specific challenges.

Admins can use this feature by configuring OCIS + Reva following this approach:
Admins can use this feature by configuring oCIS + Reva following this approach:

```
STORAGE_FRONTEND_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT="mirall:basic, Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:83.0) Gecko/20100101 Firefox/83.0:bearer" \
Expand All @@ -15,6 +15,6 @@ go run cmd/ocis/main.go server

We introduced two new environment variables:

`STORAGE_FRONTEND_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT` as well as `PROXY_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT`, The reason they have the same value is not to rely on the os env on a distributed environment, so in redundancy we trust. They both configure the same on the backend storage and OCIS Proxy.
`STORAGE_FRONTEND_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT` as well as `PROXY_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT`, The reason they have the same value is not to rely on the os env on a distributed environment, so in redundancy we trust. They both configure the same on the backend storage and oCIS Proxy.

https://github.com/owncloud/ocis/pull/1009
4 changes: 2 additions & 2 deletions changelog/1.1.0_2021-01-22/add-ocis-url-env.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Some environment variables are now built dynamically if they are not set:

Furthermore, the built in konnectd will generate an `identifier-registration.yaml` that uses the `KONNECTD_ISS` in the allowed `redirect_uris` and `origins`. It simplifies the default `https://localhost:9200` and remote deployment with `OCIS_URL` which is evaluated as a fallback if `KONNECTD_ISS` is not set.

An OCIS server can now be started on a remote machine as easy as `OCIS_URL=https://cloud.ocis.test PROXY_HTTP_ADDR=0.0.0.0:443 ocis server`.
An oCIS server can now be started on a remote machine as easy as `OCIS_URL=https://cloud.ocis.test PROXY_HTTP_ADDR=0.0.0.0:443 ocis server`.

Note that the `OCIS_DOMAIN` environment variable is not used by ocis, but by the docker containers.
Note that the `OCIS_DOMAIN` environment variable is not used by oCIS, but by the docker containers.

https://github.com/owncloud/ocis/pull/1148
2 changes: 1 addition & 1 deletion changelog/1.1.0_2021-01-22/move-k6.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Change: Move k6 to cdperf

Tags: performance, testing, k6

The ownCloud performance tests can not only be used to test ocis.
The ownCloud performance tests can not only be used to test oCIS.
This is why we have decided to move the k6 tests to https://github.com/owncloud/cdperf

https://github.com/owncloud/ocis/pull/1358
2 changes: 1 addition & 1 deletion changelog/1.1.0_2021-01-22/update-reva-to-1.5.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Details

* Enhancement #1393: Allow setting favorites, mtime and a temporary etag

We now let the ocis driver persist favorites, set temporary etags and the mtime as arbitrary
We now let the oCIS driver persist favorites, set temporary etags and the mtime as arbitrary
metadata.

https://github.com/owncloud/ocis/issues/567
Expand Down
2 changes: 1 addition & 1 deletion deployments/examples/cs3_users_ocis/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ services:
STORAGE_LDAP_ATTRIBUTEFILTER: '(&(objectclass=owncloud)({{attr}}={{value}}))'
STORAGE_LDAP_FINDFILTER: '(&(objectclass=owncloud)(|(uid={{query}}*)(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)(description={{query}}*)))'
STORAGE_LDAP_GROUPFILTER: '(&(objectclass=groupOfUniqueNames)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))'
# General ocis config
# General oCIS config
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates
Expand Down
6 changes: 3 additions & 3 deletions docs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Welcome to our developer documentation. Here you can find developer documentatio
The oCIS server is Apache v2 licensed.
The lower storage layer of oCIS is defined by the CS3 APIs and implemented in the REVA project. Our goal is to develop the CS3 APIs to an open standard and collaborate on the open source REVA reference implementation for CS3 APIs.

You can also find all client sources on github.
You can also find all client sources on GitHub.

## Join us

The oCIS server repository on github is a good entry point for you to join the project. But we also develop clients for iOS, Android, Desktop and Web.
The oCIS server repository on GitHub is a good entry point for you to join the project. But we also develop clients for iOS, Android, Desktop and Web.

For communication on development you can join our public chat [talk.owncloud.com](https://talk.owncloud.com)

If you want to help and improve ownCloud or oCIS, start coding or open issues on github in the related repository.
If you want to help and improve ownCloud or oCIS, start coding or open issues on GitHub in the related repository.

We are very happy to hear your feedback and ideas!
2 changes: 1 addition & 1 deletion docs/extensions/glauth/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ geekdocFilePath: _index.md
geekdocCollapseSection: true
---

This service provides a [glauth](https://github.com/glauth/glauth) based LDAP proxy for ocis which can be used by clients or other extensions. It allows applications relying on LDAP to access the accounts stored in the ocis accounts service. It can be used to make firewalls or identity providers aware of all users, including guest accounts.
This service provides a [glauth](https://github.com/glauth/glauth) based LDAP proxy for oCIS which can be used by clients or other extensions. It allows applications relying on LDAP to access the accounts stored in the oCIS accounts service. It can be used to make firewalls or identity providers aware of all users, including guest accounts.

We are using it to make eos aware of all accounts so the native ACLs can be used to persist share information in the storage.
2 changes: 1 addition & 1 deletion docs/extensions/settings/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ In the context of this extension and oCIS in general, we are using the following
- Manifestation of a setting for a specific user
- E.g. used for customization (at runtime) in `ocis-web`
- `ocis-web-settings` extension for modifying settings values is provided by this service
- Can be queried and modified by other ocis extensions
- Can be queried and modified by other oCIS extensions
4 changes: 2 additions & 2 deletions docs/extensions/storage/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ geekdocFilePath: _index.md
geekdocCollapseSection: true
---

This service provides an ocis extension that wraps [reva](https://github.com/cs3org/reva/) and adds an opinionated configuration to it.
This service provides an oCIS extension that wraps [reva](https://github.com/cs3org/reva/) and adds an opinionated configuration to it.

It uses the port range 9140-9179 to preconfigure several services.

Expand Down Expand Up @@ -43,4 +43,4 @@ It uses the port range 9140-9179 to preconfigure several services.
| 9165 | storage oc data debug |
| 9166-9177 | reserved for s3, wnd, custom + data providers |
| 9178 | storage public link |
| 9179 | storage public link data |
| 9179 | storage public link data |
Loading

0 comments on commit d7b1ecb

Please sign in to comment.