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

nextcloud: Rename the systemd service names

Browse Source 
- Avoid unnecessary abbreviations for consistency.

- Change file paths into pathlib paths.

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-03-22 14:23:28 -07:00 committed by James Valleroy
parent f173634319
commit 89e9fe2335
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plinth/modules/nextcloud/__init__.py
View File

@ -89,10 +89,11 @@ class NextcloudApp(app_module.App):
urls=['https://{host}/nextcloud/login']) urls=['https://{host}/nextcloud/login'])
self.add(webserver) self.add(webserver)
daemon = Daemon('daemon-nextcloud', 'nextcloud-fbx') daemon = Daemon('daemon-nextcloud', 'nextcloud-freedombox')
self.add(daemon) self.add(daemon)
daemon = Daemon('daemon-nextcloud-timer', 'nextcloud-cron-fbx.timer') daemon = Daemon('daemon-nextcloud-timer',
'nextcloud-cron-freedombox.timer')
self.add(daemon) self.add(daemon)
daemon = SharedDaemon('shared-daemon-podman-auto-update', daemon = SharedDaemon('shared-daemon-podman-auto-update',

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

@ -18,7 +18,7 @@ from plinth.actions import privileged
NETWORK_NAME = 'nextcloud-fbx' NETWORK_NAME = 'nextcloud-fbx'
BRIDGE_IP = '172.16.16.1' BRIDGE_IP = '172.16.16.1'
CONTAINER_IP = '172.16.16.2' CONTAINER_IP = '172.16.16.2'
CONTAINER_NAME = 'nextcloud-fbx' CONTAINER_NAME = 'nextcloud-freedombox'
VOLUME_NAME = 'nextcloud-volume-fbx' VOLUME_NAME = 'nextcloud-volume-fbx'
IMAGE_NAME = 'docker.io/library/nextcloud:stable-apache' IMAGE_NAME = 'docker.io/library/nextcloud:stable-apache'
@ -26,15 +26,13 @@ DB_HOST = 'localhost'
DB_NAME = 'nextcloud_fbx' DB_NAME = 'nextcloud_fbx'
DB_USER = 'nextcloud_fbx' DB_USER = 'nextcloud_fbx'
GUI_ADMIN = 'nextcloud-admin' GUI_ADMIN = 'nextcloud-admin'
SOCKET_CONFIG_FILE = pathlib.Path('/etc/mysql/mariadb.conf.d/'
'99-freedombox.cnf') _socket_config_file = pathlib.Path('/etc/mysql/mariadb.conf.d/'
SYSTEMD_LOCATION = '/etc/systemd/system/' '99-freedombox.cnf')
NEXTCLOUD_CONTAINER_SYSTEMD_FILE = pathlib.Path( _systemd_location = pathlib.Path('/etc/systemd/system/')
f'{SYSTEMD_LOCATION}{CONTAINER_NAME}.service') _container_service_file = _systemd_location / f'{CONTAINER_NAME}.service'
NEXTCLOUD_CRON_SERVICE_FILE = pathlib.Path( _cron_service_file = _systemd_location / 'nextcloud-cron-freedombox.service'
f'{SYSTEMD_LOCATION}nextcloud-cron-fbx.service') _cron_timer_file = _systemd_location / 'nextcloud-cron-freedombox.timer'
NEXTCLOUD_CRON_TIMER_FILE = pathlib.Path(
f'{SYSTEMD_LOCATION}nextcloud-cron-fbx.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')
@ -122,7 +120,7 @@ def set_domain(domain_name: str):
_run_occ('config:system:set', 'overwriteprotocol', '--value', protocol) _run_occ('config:system:set', 'overwriteprotocol', '--value', protocol)
# Restart to apply changes immediately # Restart to apply changes immediately
action_utils.service_restart('nextcloud-fbx') action_utils.service_restart('nextcloud-freedombox')
@privileged @privileged
@ -168,7 +166,7 @@ def _configure_db_socket():
[mysqld] [mysqld]
bind-address = {BRIDGE_IP} bind-address = {BRIDGE_IP}
''' '''
SOCKET_CONFIG_FILE.write_text(file_content, encoding='utf-8') _socket_config_file.write_text(file_content, encoding='utf-8')
action_utils.service_restart('mariadb') action_utils.service_restart('mariadb')
@ -255,15 +253,14 @@ def _configure_systemd():
['podman', 'generate', 'systemd', '--new', CONTAINER_NAME], ['podman', 'generate', 'systemd', '--new', CONTAINER_NAME],
capture_output=True, check=True).stdout.decode() capture_output=True, check=True).stdout.decode()
# Create service and timer for running periodic php jobs. # Create service and timer for running periodic php jobs.
NEXTCLOUD_CONTAINER_SYSTEMD_FILE.write_text(systemd_content, _container_service_file.write_text(systemd_content, encoding='utf-8')
encoding='utf-8')
nextcloud_cron_service_content = ''' nextcloud_cron_service_content = '''
[Unit] [Unit]
Description=Nextcloud cron.php job Description=Nextcloud cron.php job
[Service] [Service]
ExecCondition=/usr/bin/podman exec --user www-data nextcloud-fbx php occ status -e ExecCondition=/usr/bin/podman exec --user www-data nextcloud-freedombox php occ status -e
ExecStart=/usr/bin/podman exec --user www-data nextcloud-fbx php /var/www/html/cron.php ExecStart=/usr/bin/podman exec --user www-data nextcloud-freedombox php /var/www/html/cron.php
KillMode=process KillMode=process
''' # noqa: E501 ''' # noqa: E501
nextcloud_cron_timer_content = '''[Unit] nextcloud_cron_timer_content = '''[Unit]
@ -272,13 +269,14 @@ Description=Run Nextcloud cron.php every 5 minutes
[Timer] [Timer]
OnBootSec=5min OnBootSec=5min
OnUnitActiveSec=5min OnUnitActiveSec=5min
Unit=nextcloud-cron-fbx.service Unit=nextcloud-cron-freedombox.service
[Install] [Install]
WantedBy=timers.target WantedBy=timers.target
''' '''
NEXTCLOUD_CRON_SERVICE_FILE.write_text(nextcloud_cron_service_content) _cron_service_file.write_text(nextcloud_cron_service_content)
NEXTCLOUD_CRON_TIMER_FILE.write_text(nextcloud_cron_timer_content) _cron_timer_file.write_text(nextcloud_cron_timer_content)
action_utils.service_daemon_reload() action_utils.service_daemon_reload()
@ -296,13 +294,12 @@ def uninstall():
network_name=NETWORK_NAME, network_name=NETWORK_NAME,
volume_name=VOLUME_NAME, volume_name=VOLUME_NAME,
image_name=IMAGE_NAME) image_name=IMAGE_NAME)
files = [NEXTCLOUD_CRON_SERVICE_FILE, NEXTCLOUD_CRON_TIMER_FILE] for path in [_cron_service_file, _cron_timer_file]:
for file in files: path.unlink(missing_ok=True)
file.unlink(missing_ok=True)
def _remove_db_socket(): def _remove_db_socket():
SOCKET_CONFIG_FILE.unlink(missing_ok=True) _socket_config_file.unlink(missing_ok=True)
action_utils.service_restart('mariadb') action_utils.service_restart('mariadb')