-
Notifications
You must be signed in to change notification settings - Fork 34
fix: more work on OC11 docs #1557
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 11 commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
5a80acb
fix: remove orphaned images
mmattel 48f594e
sync config sample from core
mmattel 6af8b39
add envvar list
mmattel 134c133
mostly enterprise changes
mmattel eb45a9e
safe work
mmattel 913b7c8
save work
mmattel 0a0a4d0
enterprise section is done
mmattel bb125b0
safe work
mmattel 6ef43fa
cleanup, more to come
mmattel 839fc20
migration
mmattel 9850cab
finalize migration
mmattel a1329c0
remove orphaned backticks in SQL
mmattel 556b6d7
fix double slash in nav.adoc
mmattel e526f3a
fix missing backtick in admin_audit.adoc
mmattel f5d310d
fix license key links
mmattel 3f429da
fix xref segment in general troubleshooting
mmattel 028bef7
fix: correct malformed env var entries in envvars.adoc
DeepDiver1975 f5d8112
fix: correct audit log example in admin_audit.adoc
DeepDiver1975 7b126d4
fix: table render, page alias and WND account name
DeepDiver1975 a5c99c5
fix: WOPI source language tag and typo
DeepDiver1975 80bab9d
fix anchor in envvars.adoc
mmattel 781cfc3
Apply suggestions from code review
mmattel 28b33b5
remove docs for firewall.branded_clients config
mmattel d60a7c0
remove unused envvars from envvar list
mmattel 5e088fb
Merge remote-tracking branch 'origin/more_work_on_oc11' into more_wor…
mmattel a84ee70
remove one more unused envvar from the envvar list
mmattel 931b785
remove impersonate from admin_audit
mmattel 3d45a4d
Apply suggestions from code review
mmattel ae560ca
use start transaction instead of begin transaction
mmattel 1986ee7
add lost slash in admin_audit
mmattel 416b74c
more fixes to envvars list
mmattel 1db2adc
text fix
mmattel 03b47a7
fix: correct typos and grammar in OC11 admin docs
DeepDiver1975 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file removed
BIN
-29.6 KB
modules/admin_manual/images/apps/impersonate/impersonate_enable.png
Binary file not shown.
Binary file removed
BIN
-23.3 KB
modules/admin_manual/images/apps/impersonate/impersonate_group_admins_only.png
Binary file not shown.
Binary file removed
BIN
-35.3 KB
modules/admin_manual/images/apps/impersonate/impersonate_groups_only.png
Binary file not shown.
Binary file removed
BIN
-23.2 KB
modules/admin_manual/images/apps/impersonate/impersonate_oc_admins_only.png
Binary file not shown.
Binary file removed
BIN
-5.58 KB
modules/admin_manual/images/apps/impersonate/impersonating-a-user.png
Binary file not shown.
Binary file removed
BIN
-20.6 KB
modules/admin_manual/images/apps/impersonate/picking-a-user-to-impersonate.png
Binary file not shown.
Binary file removed
BIN
-22.9 KB
...les/admin_manual/images/enterprise/external_storage/sharepoint/sharepoint-1.png
Binary file not shown.
Binary file removed
BIN
-11.8 KB
...les/admin_manual/images/enterprise/external_storage/sharepoint/sharepoint-2.png
Binary file not shown.
Binary file removed
BIN
-8.5 KB
...les/admin_manual/images/enterprise/external_storage/sharepoint/sharepoint-3.png
Binary file not shown.
Binary file removed
BIN
-3.98 KB
...les/admin_manual/images/enterprise/external_storage/sharepoint/sharepoint-4.png
Binary file not shown.
Binary file modified
BIN
-7.33 KB
(44%)
modules/admin_manual/images/enterprise/logging/admin_auditing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
513 changes: 513 additions & 0 deletions
513
modules/admin_manual/pages/configuration/envvars/envvars.adoc
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
modules/admin_manual/pages/configuration/important_notes.adoc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| = Important Configuration Notes | ||
| :toc: right | ||
| :page-aliases: installation/configuration_notes.adoc | ||
| :description: This page provides some important configuration notes. | ||
|
|
||
| == Introduction | ||
|
|
||
| {description} | ||
|
|
||
| Due to this version's Docker-only approach, some aspects of configuring your ownCloud Classic Server have changed. With a few exceptions, using environment variables is the only way to configure the instance. | ||
|
|
||
| == Environment Variables | ||
|
|
||
| The majority of config keys that are provided by ownCloud can be found in the xref:configuration/envvars/envvars.adoc[Environment Variables] documentation. For the few exceptions, the traditional configuration key approach must be used. The documentation for the configuration keys also refers to the corresponding environment variables. | ||
|
|
||
| == Using Configuration Keys | ||
|
|
||
| IMPORTANT: This approach should only be used if there is no environment variable available. This is noted in the relevant section of the documentation. | ||
|
|
||
| === Preparation | ||
|
|
||
| In order to add configuration keys instead of using environment variables, some preparation is required. | ||
|
|
||
| * Change to the mounted docker volume where the configuration is stored. | ||
| + | ||
| [source,bash] | ||
| ---- | ||
| cd <mount_point>/config | ||
| ---- | ||
|
|
||
| * Next, create a new file with the same owner and permissions as the existing files. The naming must follow the scheme `<name>.config.php`. Replace `<name>` with the name of choice but consider that the order in which configuration files are read is alphabetical. | ||
| + | ||
| IMPORTANT: If a key/value pair exists in a file, it will take precedence over any existing ones defined in a config file that is read earlier. It is therefore crucial that you use a name that makes the file last read. | ||
|
|
||
| * This file must have the following mandatory content: | ||
| + | ||
| [source,php] | ||
| ---- | ||
| <?php | ||
| $CONFIG = array ( | ||
|
|
||
| ); | ||
| ---- | ||
|
|
||
| === Add own Configuration Keys | ||
|
|
||
| Once you have finished preparing the file, you can add the relevant configuration keys manually. | ||
|
|
||
| * Add your configuration keys and values to the array as usual. | ||
| + | ||
| CAUTION: Be careful not to overwrite any existing values from other files defined via environment variables. These variables are activated and configured when the container starts up. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.