Skip to content

Add additional apps directory #5

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.

Sign up for GitHub

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

Open
pc-fan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add additional apps directory #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ee3c8a
Add additional apps directory to the $OWNCLOUD_DATA_DIR and to the ow…
pc-fan Jan 13, 2016
764c15c
Fixed typo in configuration of owncloud apps_paths
pc-fan Jan 13, 2016
4b3831e
Change the apps_paths to single line, otherwise sed outputs an error
pc-fan Jan 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/runtime/env-defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ DEBUG=${DEBUG:-false}
OWNCLOUD_CONFIG_DIR=${OWNCLOUD_CONFIG_DIR:-$OWNCLOUD_DATA_DIR/config}
OWNCLOUD_OCDATA_DIR=${OWNCLOUD_OCDATA_DIR:-$OWNCLOUD_DATA_DIR/ocdata}
OWNCLOUD_BACKUPS_DIR=${OWNCLOUD_BACKUPS_DIR:-$OWNCLOUD_DATA_DIR/backups}
OWNCLOUD_APPS_DIR=${OWNCLOUD_APPS_DIR:-$OWNCLOUD_DATA_DIR/apps}

OWNCLOUD_ADMIN_USER=${OWNCLOUD_ADMIN_USER:-admin}
OWNCLOUD_ADMIN_PASSWORD=${OWNCLOUD_ADMIN_PASSWORD:-password}
Expand Down
17 changes: 17 additions & 0 deletions assets/runtime/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,12 @@ owncloud_configure_domain() {
sed -i "s|0 => '.*',|0 => '${OWNCLOUD_FQDN}',|" ${OWNCLOUD_APP_CONFIG}
}

owncloud_configure_apps_paths() {
echo "Configuring ownCloud::apps_paths..."
apps_paths="array ( 0 => array ( 'path' => OC::\$SERVERROOT.'/apps', 'url' => '/apps', 'writable' => false, ), 1 => array ( 'path' => OC::\$SERVERROOT.'/apps2', 'url' => '/apps2', 'writable' => true, ),)"
Copy link
Copy Markdown
Contributor Author

@pc-fan pc-fan Jan 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like at the moment we can only use this spaghetti like line, otherwise the sed command in owncloud_set_param throws an error.
(This was my attempt: https://github.com/pc-fan/docker-owncloud/blob/764c15cb26752d088e0b2337771f706457d31d07/assets/runtime/functions#L315)

owncloud_set_param apps_paths "$apps_paths"
}

owncloud_configure_max_upload_size() {
echo "Configuring ownCloud::max_upload_size..."
(
Expand Down Expand Up @@ -505,8 +511,16 @@ initialize_datadir() {
chmod -R 0755 ${OWNCLOUD_BACKUPS_DIR}
chown -R ${OWNCLOUD_USER}: ${OWNCLOUD_BACKUPS_DIR}

# create apps directory
mkdir -p ${OWNCLOUD_APPS_DIR}
chown -R ${OWNCLOUD_USER}: ${OWNCLOUD_APPS_DIR}
chmod -R 0750 ${OWNCLOUD_APPS_DIR}

# symlink to config/config.php -> ${OWNCLOUD_CONFIG_DIR}/config.php
ln -sf ${OWNCLOUD_CONFIG_DIR}/config.php ${OWNCLOUD_INSTALL_DIR}/config/config.php

# symlink to apps2 -> ${OWNCLOUD_APPS_DIR}
ln -sf ${OWNCLOUD_APPS_DIR} ${OWNCLOUD_INSTALL_DIR}/apps2
}

initialize_system() {
Expand All @@ -519,6 +533,7 @@ configure_owncloud() {
owncloud_configure_database
owncloud_upgrade
owncloud_configure_domain
owncloud_configure_apps_paths
owncloud_configure_max_upload_size
owncloud_configure_max_file_uploads

Expand All @@ -541,6 +556,7 @@ backup_create() {
backup_dump_database
backup_dump_directory ${OWNCLOUD_CONFIG_DIR} .tar.gz
backup_dump_directory ${OWNCLOUD_OCDATA_DIR} .tar
backup_dump_directory ${OWNCLOUD_APPS_DIR} .tar.gz
backup_dump_information
backup_create_archive backup_information.yml database.sql.gz config.tar.gz ocdata.tar
backup_purge_expired
Expand Down Expand Up @@ -596,4 +612,5 @@ backup_restore() {
backup_restore_database
backup_restore_directory ${OWNCLOUD_CONFIG_DIR} .tar.gz
backup_restore_directory ${OWNCLOUD_OCDATA_DIR} .tar
backup_restore_directory ${OWNCLOUD_APPS_DIR} .tar.gz
}