nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

nextcloud: Ship instead of create cron timer related units

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2024-04-14 17:55:21 -07:00 committed by James Valleroy
parent 035d3b49bf
commit 6b046ec27d
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plinth/modules/nextcloud/data/usr/lib/systemd/system/nextcloud-cron-freedombox.service Normal file
View File

@ -0,0 +1,8 @@
[Unit]
Description=Nextcloud cron.php job
Documentation=https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/background_jobs_configuration.html#systemd
[Service]
ExecCondition=/usr/bin/podman exec --user www-data nextcloud-freedombox /var/www/html/occ status -e
ExecStart=/usr/bin/podman exec --user www-data nextcloud-freedombox php -f /var/www/html/cron.php
KillMode=process

11
plinth/modules/nextcloud/data/usr/lib/systemd/system/nextcloud-cron-freedombox.timer Normal file
View File

@ -0,0 +1,11 @@
[Unit]
Description=Run Nextcloud cron.php every 5 minutes
Documentation=https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/background_jobs_configuration.html#systemd
[Timer]
OnBootSec=5min
OnUnitActiveSec=5min
Unit=nextcloud-cron-freedombox.service
[Install]
WantedBy=timers.target

40
plinth/modules/nextcloud/privileged.py
View File

@ -27,9 +27,6 @@ GUI_ADMIN = 'nextcloud-admin'
REDIS_DB = 8 # Don't clash with other redis apps REDIS_DB = 8 # Don't clash with other redis apps
_data_path = pathlib.Path('/var/lib/nextcloud/') _data_path = pathlib.Path('/var/lib/nextcloud/')
_systemd_location = pathlib.Path('/etc/systemd/system/')
_cron_service_file = _systemd_location / 'nextcloud-cron-freedombox.service'
_cron_timer_file = _systemd_location / 'nextcloud-cron-freedombox.timer'
DB_BACKUP_FILE = pathlib.Path( DB_BACKUP_FILE = pathlib.Path(
'/var/lib/plinth/backups-data/nextcloud-database.sql') '/var/lib/plinth/backups-data/nextcloud-database.sql')
@ -67,8 +64,6 @@ def setup():
_configure_ldap() _configure_ldap()
_configure_systemd()
def _run_in_container( def _run_in_container(
*args, capture_output: bool = False, check: bool = True, *args, capture_output: bool = False, check: bool = True,
@ -254,39 +249,6 @@ def _configure_ldap():
_run_occ('ldap:set-config', 's01', key, value) _run_occ('ldap:set-config', 's01', key, value)
def _configure_systemd():
"""Create systemd units files for container and cron jobs."""
# Create service and timer for running periodic php jobs.
doc = 'https://docs.nextcloud.com/server/stable/admin_manual/' \
'configuration_server/background_jobs_configuration.html#systemd'
nextcloud_cron_service_content = f'''
[Unit]
Description=Nextcloud cron.php job
Documentation={doc}
[Service]
ExecCondition=/usr/bin/podman exec --user www-data {CONTAINER_NAME} /var/www/html/occ status -e
ExecStart=/usr/bin/podman exec --user www-data {CONTAINER_NAME} php -f /var/www/html/cron.php
KillMode=process
''' # noqa: E501
nextcloud_cron_timer_content = '''[Unit]
Description=Run Nextcloud cron.php every 5 minutes
Documentation={doc}
[Timer]
OnBootSec=5min
OnUnitActiveSec=5min
Unit=nextcloud-cron-freedombox.service
[Install]
WantedBy=timers.target
'''
_cron_service_file.write_text(nextcloud_cron_service_content)
_cron_timer_file.write_text(nextcloud_cron_timer_content)
action_utils.service_daemon_reload()
@privileged @privileged
def uninstall(): def uninstall():
"""Uninstall Nextcloud""" """Uninstall Nextcloud"""
@ -295,8 +257,6 @@ def uninstall():
volume_name=VOLUME_NAME, volume_name=VOLUME_NAME,
image_name=IMAGE_NAME, image_name=IMAGE_NAME,
volume_path=str(_data_path)) volume_path=str(_data_path))
for path in [_cron_service_file, _cron_timer_file]:
path.unlink(missing_ok=True)
def _drop_database(): def _drop_database():