YunoHost-Apps/nextcloud_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nextcloud_ynh.git synced 2024-09-03 19:55:57 +02:00
Code Issues Activity Actions

[fix] Set correct data directory and chmod config/config.php

Browse source
This commit is contained in:
Jérôme Lebleu 2016-04-03 21:34:44 +02:00
parent ee61d16483
commit 97b9a2b58f
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/config.json
View file

@ -1,5 +1,6 @@
{ {
"system": { "system": {
"datadirectory": "#DATADIR#",
"trusted_domains": [ "trusted_domains": [
"localhost", "localhost",
"#DOMAIN#" "#DOMAIN#"

28
scripts/install
View file

@ -34,6 +34,9 @@ DESTDIR="/var/www/$app"
"The destination directory '$DESTDIR' already exists.\ "The destination directory '$DESTDIR' already exists.\
You should safely delete it before installing this app." You should safely delete it before installing this app."
# Define app's data directory
DATADIR="/home/yunohost.app/${app}/data"
# Install dependencies # Install dependencies
ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control \ ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control \
|| die "Unable to install dependencies" || die "Unable to install dependencies"
@ -50,22 +53,18 @@ sudo useradd -c "$app system account" \
-d /var/lib/$app --system --user-group $app \ -d /var/lib/$app --system --user-group $app \
|| die "Unable to create $app system account" || die "Unable to create $app system account"
# Create ownCloud destination directory # Create app folders
sudo mkdir -p "$DESTDIR" sudo mkdir -p "$DESTDIR" "$DATADIR"
# Copy ownCloud configuration file # Copy ownCloud configuration file
oc_conf="${DESTDIR}/config.json" oc_conf="${DESTDIR}/config.json"
sed -i "s@#DOMAIN#@${domain}@g" ../conf/config.json sed -i "s@#DOMAIN#@${domain}@g" ../conf/config.json
sed -i "s@#DATADIR#@${DATADIR}@g" ../conf/config.json
sudo cp ../conf/config.json "$oc_conf" sudo cp ../conf/config.json "$oc_conf"
# Create and init data folder # Copy configuration for external storage plugin
DATADIR="/home/yunohost.app/${app}/data"
sudo mkdir -p "$DATADIR"
sudo cp ../conf/mount.json "$DATADIR" sudo cp ../conf/mount.json "$DATADIR"
# Set app folders ownership
sudo chown -R $app: "$DESTDIR" "$DATADIR"
# Copy and set nginx configuration # Copy and set nginx configuration
nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
sed -i "s@#APP#@${app}@g" ../conf/nginx.conf sed -i "s@#APP#@${app}@g" ../conf/nginx.conf
@ -87,12 +86,18 @@ _exec_occ() {
exec_occ "$DESTDIR" "$app" $@ exec_occ "$DESTDIR" "$app" $@
} }
# Retrieve and install ownCloud using a temporary admin user # Set app folders ownership
sudo chown -R $app: "$DESTDIR" "$DATADIR"
# Retrieve ownCloud sources
extract_owncloud "$DESTDIR" "$app" extract_owncloud "$DESTDIR" "$app"
# Install ownCloud using a temporary admin user
_exec_occ maintenance:install \ _exec_occ maintenance:install \
--database "mysql" --database-name "$dbname" \ --database "mysql" --database-name "$dbname" \
--database-user "$dbuser" --database-pass "$dbpass" \ --database-user "$dbuser" --database-pass "$dbpass" \
--admin-user "admin" --admin-pass "$(ynh_string_random 6)" \ --admin-user "admin" --admin-pass "$(ynh_string_random 6)" \
--data-dir "$DATADIR" \
|| die "Unable to install ownCloud" || die "Unable to install ownCloud"
# Enable plugins and set ownCloud configuration # Enable plugins and set ownCloud configuration
@ -117,13 +122,14 @@ for u in $(ynh_user_list); do
sudo setfacl -m g:$app:rwx "/home/$u" || true sudo setfacl -m g:$app:rwx "/home/$u" || true
done done
# Fix app folders permissions # Fix app ownerships & permissions
sudo chown -R $app: "$DESTDIR" "$DATADIR" sudo chown -R $app: "$DESTDIR" "$DATADIR"
sudo chmod 755 /home/yunohost.app
sudo find ${DESTDIR}/ -type f -print0 | sudo xargs -0 chmod 0644 sudo find ${DESTDIR}/ -type f -print0 | sudo xargs -0 chmod 0644
sudo find ${DESTDIR}/ -type d -print0 | sudo xargs -0 chmod 0755 sudo find ${DESTDIR}/ -type d -print0 | sudo xargs -0 chmod 0755
sudo find ${DATADIR}/ -type f -print0 | sudo xargs -0 chmod 0640 sudo find ${DATADIR}/ -type f -print0 | sudo xargs -0 chmod 0640
sudo find ${DATADIR}/ -type d -print0 | sudo xargs -0 chmod 0750 sudo find ${DATADIR}/ -type d -print0 | sudo xargs -0 chmod 0750
sudo chmod 640 "${DESTDIR}/config/config.php"
sudo chmod 755 /home/yunohost.app
# Set SSOwat rules # Set SSOwat rules
ynh_app_setting_set $app unprotected_uris "/" ynh_app_setting_set $app unprotected_uris "/"