Skip to content

Commit

Permalink
Move backend to SQLite
Browse files Browse the repository at this point in the history
  • Loading branch information
mreid-tt committed Mar 16, 2023
1 parent 0782bff commit 946566a
Show file tree
Hide file tree
Showing 9 changed files with 314 additions and 304 deletions.
34 changes: 19 additions & 15 deletions spk/owncloud/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,41 @@ SPK_ICON = src/owncloud.png
DSM_UI_DIR = app

DEPENDS = cross/$(SPK_NAME)
SPK_DEPENDS = "WebStation:PHP7.4:Apache2.4"

REQUIRED_MIN_DSM = 6.0

MAINTAINER = ymartin59
DESCRIPTION = ownCloud is a personal cloud which runs on your own server and gives you freedom and control over your own data.
ADMIN_URL = /owncloud/
CHANGELOG = "1. Update ownCloud to 10.11.<br/>2. Use faster SQLite database."
DISPLAY_NAME = ownCloud
CHANGELOG = "1. Update ownCloud to 10.11."
HOMEPAGE = https://owncloud.org/
LICENSE = AGPL

HOMEPAGE = https://owncloud.org/
LICENSE = AGPL
STARTABLE = yes
SERVICE_USER = auto
SERVICE_SETUP = src/service-setup.sh

REQUIRED_MIN_DSM = 5.0
SYSTEM_GROUP = http

WIZARDS_DIR = src/wizard/
CONF_DIR = src/conf/
# Admin link for in DSM UI
ADMIN_URL = /owncloud/
ADMIN_PROTOCOL = https

SERVICE_SETUP = src/service-setup.sh
SERVICE_COMMAND = $(INSTALL_PREFIX)/bin/owncloud-daemon
CONF_DIR = src/conf/
WIZARDS_DIR = src/wizard/

SPK_DEPENDS = "WebStation:MariaDB10:PHP7.4:Apache2.4"
INSTALL_DEP_SERVICES = apache-web mysql
START_DEP_SERVICES = apache-web mysql
INSTUNINST_RESTART_SERVICES = apache-web
SYSTEM_GROUP = http
DSM_UI_CONFIG = src/app/config

POST_STRIP_TARGET = owncloud_extra_install

# TMPDIR is used for owncloud built in backup and update
USE_ALTERNATE_TMPDIR = 1

include ../../mk/spksrc.spk.mk

.PHONY: owncloud_extra_install
owncloud_extra_install:
install -m 755 -d $(STAGING_DIR)/app -d $(STAGING_DIR)/bin
install -m 644 src/app/config $(STAGING_DIR)/app/config
install -m 755 src/bin/owncloud-daemon $(STAGING_DIR)/bin/owncloud-daemon
install -m 755 src/bin/owncloud.sh $(STAGING_DIR)/bin/owncloud.sh
23 changes: 10 additions & 13 deletions spk/owncloud/src/app/config
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
".url": {
"com.synocommunity.packages.owncloud": {
"title": "ownCloud",
"desc": "ownCloud",
"icon": "images/owncloud-{0}.png",
"type": "url",
"protocol": "http",
"port": "80",
"url": "/owncloud",
"allUsers": true,
"grantPrivilege": "local"
}
".url":{
"com.synocommunity.packages.owncloud":{
"allUsers":true,
"desc":"ownCloud",
"icon":"images/owncloud-{0}.png",
"title":"ownCloud",
"type":"url",
"url":"/owncloud"
}
}
}
}
94 changes: 21 additions & 73 deletions spk/owncloud/src/bin/owncloud-daemon
Original file line number Diff line number Diff line change
@@ -1,77 +1,25 @@
#!/bin/sh

# Package
PACKAGE="owncloud"
DNAME="ownCloud"
set -e

# Others
# ownCloud service setup
WEB_DIR="/var/services/web_packages"
PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
BUILDNUMBER="$(/bin/get_key_value /etc.defaults/VERSION buildnumber)"
USER="$([ "${BUILDNUMBER}" -ge "4418" ] && echo -n http || echo -n nobody)"
OWNCLOUD="${SYNOPKG_PKGDEST}/bin/owncloud.sh"
PID_FILE="${SYNOPKG_PKGDEST}/var/owncloud.pid"


start_daemon ()
{
start-stop-daemon -S -q -m -b -N 10 -x ${OWNCLOUD} -c ${USER} -u ${USER} -p ${PID_FILE} > /dev/null
}

stop_daemon ()
{
start-stop-daemon -K -q -u ${USER} -p ${PID_FILE}
wait_for_status 1 20 || start-stop-daemon -K -s 9 -q -p ${PID_FILE}
}

daemon_status ()
{
start-stop-daemon -K -q -t -u ${USER} -p ${PID_FILE}
}

wait_for_status ()
{
counter=$2
while [ ${counter} -gt 0 ]; do
daemon_status
[ $? -eq $1 ] && return
let counter=counter-1
sleep 1
done
return 1
}


case $1 in
start)
if daemon_status; then
echo ${DNAME} is already running
else
echo Starting ${DNAME} ...
start_daemon
fi
;;
stop)
if daemon_status; then
echo Stopping ${DNAME} ...
stop_daemon
else
echo ${DNAME} is not running
fi
;;
status)
if daemon_status; then
echo ${DNAME} is running
exit 0
else
echo ${DNAME} is not running
exit 1
fi
;;
log)
exit 1
;;
*)
exit 1
;;
esac
# for backwards compatability
if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ];then
WEB_DIR="/var/services/web"
fi
OWNCLOUD="${WEB_DIR}/${SYNOPKG_PKGNAME}/occ background:cron"
HOME_DIR="${SYNOPKG_PKGVAR}"
PHP="/usr/local/bin/php74"
SLEEP_TIME="1800"

# Main loop
while true; do
# Update
echo "Updating..."
${PHP} ${OWNCLOUD} >> "${SYNOPKG_PKGVAR}/daemon.log" 2>&1

# Wait
echo "Waiting ${SLEEP_TIME} seconds..."
sleep ${SLEEP_TIME}
done
18 changes: 0 additions & 18 deletions spk/owncloud/src/bin/owncloud.sh

This file was deleted.

36 changes: 10 additions & 26 deletions spk/owncloud/src/conf/resource
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
{
"mariadb10-db":{
"admin-account-m10":"root",
"admin-pw-m10":"{{wizard_mysql_password_root}}",
"create-db":{
"db-collision":"skip",
"db-name":"owncloud",
"flag":true
},
"drop-db-uninst":false,
"drop-user-uninst":false,
"grant-user":{
"db-name":"owncloud",
"flag":true,
"user-name":"owncloud",
"user-pw":"{{wizard_mysql_password_owncloud}}"
}
},
"webservice":{
"migrate":{
"root":[
Expand All @@ -39,8 +22,8 @@
"alias":"owncloud",
"app":"com.synocommunity.packages.owncloud",
"display_name":"ownCloud",
"name":"owncloud",
"service":"owncloud",
"name":"ownCloud",
"service":"ownCloud",
"type":"alias"
}
],
Expand All @@ -62,24 +45,25 @@
"intl",
"ldap",
"openssl",
"pdo_mysql",
"pdo_sqlite",
"sqlite3",
"ssh2",
"zip",
"zlib"
],
"group":"http",
"php_settings":{
"error_log":"/var/services/web_packages/owncloud/php_errors.log",
"pdo_mysql.default_socket":"/run/mysqld/mysqld10.sock"
"max_execution_time":"900"
},
"profile_desc":"PHP Profile for owncloud",
"profile_name":"owncloud Profile",
"read_timeout":3600,
"send_timeout":120,
"profile_desc":"PHP Profile for ownCloud",
"profile_name":"ownCloud Profile",
"user":"sc-owncloud"
},
"read_timeout":3600,
"root":"owncloud",
"service":"owncloud",
"send_timeout":120,
"service":"ownCloud",
"type":"apache_php"
}
]
Expand Down
Binary file modified spk/owncloud/src/owncloud.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 946566a

Please sign in to comment.