From d2f6d281372486f1abf296b5481183554e690a8b Mon Sep 17 00:00:00 2001 From: mwiegand Date: Wed, 30 Jun 2021 22:55:44 +0200 Subject: [PATCH] wip --- .envrc | 3 + bundles/nextcloud/items.py | 169 ++++++++++++++++------------------ bundles/nextcloud/metadata.py | 24 +++-- libs/nextcloud.py | 2 + nodes/htz.mails.py | 9 +- 5 files changed, 105 insertions(+), 102 deletions(-) create mode 100644 libs/nextcloud.py diff --git a/.envrc b/.envrc index 23fd917..6894359 100644 --- a/.envrc +++ b/.envrc @@ -2,4 +2,7 @@ python3 -m venv .venv source ./.venv/bin/activate + +export BW_GIT_DEPLOY_CACHE="$(realpath ~)/.cache/bw/git_deploy" +mkdir -p "$BW_GIT_DEPLOY_CACHE" unset PS1 diff --git a/bundles/nextcloud/items.py b/bundles/nextcloud/items.py index 8e5d990..f8f2e48 100644 --- a/bundles/nextcloud/items.py +++ b/bundles/nextcloud/items.py @@ -4,97 +4,86 @@ from shlex import quote from os.path import join from mako.template import Template -def occ(command, *args, **kwargs): - return f"""sudo -u www-data php /opt/nextcloud/occ {command} {' '.join(args)} {' '.join(f'--{name.replace("_", "-")}' + (f'={value}' if value else '') for name, value in kwargs.items())}""" +print(f"v{node.metadata.get('nextcloud/version')}") -version = node.metadata.get('nextcloud/version') -# DOWNLOAD - -downloads[f'/tmp/nextcloud-{version}.tar.bz2'] = { - 'url': f'https://download.nextcloud.com/server/releases/nextcloud-{version}.tar.bz2', - 'sha256': node.metadata.get('nextcloud/sha256'), - 'triggered': True, -} -actions['delete_nextcloud'] = { - 'command': 'rm -rf /opt/nextcloud/*', - 'triggered': True, -} -actions['extract_nextcloud'] = { - 'command': f'tar xfvj /tmp/nextcloud-{version}.tar.bz2 --skip-old-files --strip 1 -C /opt/nextcloud nextcloud', - 'unless': f"""php -r 'include "/opt/nextcloud/version.php"; echo "$OC_VersionString";' | grep -q '^{version}$'""", - 'preceded_by': [ - 'action:delete_nextcloud', - f'download:/tmp/nextcloud-{version}.tar.bz2', - ], - 'needs': [ - 'action:symlink_/opt/nextcloud/config', - 'directory:/opt/nextcloud', - ], -} - -# DIRECTORIES, FILES AND SYMLINKS - -directories['/etc/nextcloud'] = { - 'owner': 'www-data', - 'group': 'www-data', -} -directories['/opt/nextcloud'] = {} -directories['/var/lib/nextcloud'] = { - 'owner': 'www-data', - 'group': 'www-data', - 'mode': '770', -} -directories['/var/lib/nextcloud/.apps'] = { - 'owner': 'www-data', - 'group': 'www-data', -} -directories['/var/lib/nextcloud/.cache'] = { - 'owner': 'www-data', - 'group': 'www-data', -} -files['/etc/nextcloud/CAN_INSTALL'] = { - 'content': '', - 'owner': 'www-data', - 'group': 'www-data', - 'mode': '640', - 'needs': [ - 'directory:/etc/nextcloud', - ], -} -files['/etc/nextcloud/managed.config.php'] = { - 'content_type': 'mako', - 'owner': 'www-data', - 'group': 'www-data', - 'mode': '640', - 'context': { - 'db_password': node.metadata.get('postgresql/roles/nextcloud/password'), +directories = { + '/opt/nextcloud': {}, + '/etc/nextcloud': { + 'owner': 'www-data', + }, + '/var/lib/nextcloud': { + 'owner': 'www-data', + 'mode': '770', + }, + '/var/lib/nextcloud/.apps': { + 'owner': 'www-data', + }, + '/var/lib/nextcloud/.cache': { + 'owner': 'www-data', }, - 'needs': [ - 'directory:/etc/nextcloud', - ], } -actions['symlink_/opt/nextcloud/config'] = { - 'command': f'ln -s /etc/nextcloud /opt/nextcloud/config && chown www-data:www-data /opt/nextcloud/config', - 'unless': 'readlink /opt/nextcloud/config | grep -q /etc/nextcloud', - 'needs': [ - 'action:delete_nextcloud', - 'directory:/etc/nextcloud', - ], + +git_deploy = { + '/opt/nextcloud': { + 'repo': 'git://github.com/nextcloud/server.git', + 'rev': f"v{node.metadata.get('nextcloud/version')}", + 'needs': { + 'directory:/opt/nextcloud', + }, + }, + '/opt/nextcloud/3rdparty': { + 'repo': 'git://github.com/nextcloud/3rdparty.git', + 'rev': f"v{node.metadata.get('nextcloud/version')}", + 'needs': { + 'git_deploy:/opt/nextcloud', + }, + }, } -actions['symlink_/opt/nextcloud/userapps'] = { - 'command': f'ln -s /var/lib/nextcloud/.apps /opt/nextcloud/userapps && chown www-data:www-data /opt/nextcloud/userapps', - 'unless': 'readlink /opt/nextcloud/userapps | grep -q /var/lib/nextcloud/.apps', - 'needs': [ - 'action:delete_nextcloud', - 'directory:/var/lib/nextcloud/.apps', - ], + +symlinks = { + '/opt/nextcloud/config': { + 'target': '/etc/nextcloud', + 'owner': 'www-data', + 'needs': [ + 'git_deploy:/opt/nextcloud', + ], + }, + '/opt/nextcloud/userapps': { + 'target': '/var/lib/nextcloud/.apps', + 'owner': 'www-data', + 'needs': [ + 'git_deploy:/opt/nextcloud', + ], + }, +} + +files = { + '/etc/nextcloud/CAN_INSTALL': { + 'content': '', + 'owner': 'www-data', + 'mode': '640', + 'needs': [ + 'directory:/etc/nextcloud', + ], + }, + '/etc/nextcloud/managed.config.php': { + 'content_type': 'mako', + 'owner': 'www-data', + 'mode': '640', + 'context': { + 'db_password': node.metadata.get('postgresql/roles/nextcloud/password'), + }, + 'needs': [ + 'directory:/etc/nextcloud', + ], + }, } # SETUP actions['install_nextcloud'] = { - 'command': occ( + 'command': repo.libs.nextcloud.occ( 'maintenance:install', no_interaction=None, database='pgsql', @@ -106,18 +95,19 @@ actions['install_nextcloud'] = { admin_pass=node.metadata.get('nextcloud/admin_pass'), data_dir='/var/lib/nextcloud', ), - 'unless': occ('status') + ' | grep -q "installed: true"', + 'unless': repo.libs.nextcloud.occ('status') + ' | grep -q "installed: true"', 'needs': [ 'directory:/etc/nextcloud', 'directory:/opt/nextcloud', 'directory:/var/lib/nextcloud', 'directory:/var/lib/nextcloud/.apps', 'directory:/var/lib/nextcloud/.cache', + 'symlink:/opt/nextcloud/config', + 'symlink:/opt/nextcloud/userapps', + 'git_deploy:/opt/nextcloud', + 'git_deploy:/opt/nextcloud/3rdparty', 'file:/etc/nextcloud/CAN_INSTALL', 'file:/etc/nextcloud/managed.config.php', - 'action:extract_nextcloud', - 'action:symlink_/opt/nextcloud/userapps', - 'action:symlink_/opt/nextcloud/config', 'postgres_db:nextcloud', ], } @@ -125,21 +115,20 @@ actions['install_nextcloud'] = { # UPGRADE actions['upgrade_nextcloud'] = { - 'command': occ('upgrade'), - 'unless': occ('status') + f' | grep -q "versionstring: {version}"', + 'command': repo.libs.nextcloud.occ('upgrade'), + 'unless': repo.libs.nextcloud.occ('status') + f' | grep -q "versionstring: {node.metadata.get("nextcloud/version")}"', 'needs': [ 'action:install_nextcloud', ], } actions['nextcloud_add_missing_inidces'] = { - 'command': occ('db:add-missing-indices'), + 'command': repo.libs.nextcloud.occ('db:add-missing-indices'), 'needs': [ 'action:upgrade_nextcloud', ], 'triggered': True, 'triggered_by': [ - f'action:extract_nextcloud', - f'action:upgrade_nextcloud', + f'git_deploy:/opt/nextcloud', ], } diff --git a/bundles/nextcloud/metadata.py b/bundles/nextcloud/metadata.py index 996105c..bc427a9 100644 --- a/bundles/nextcloud/metadata.py +++ b/bundles/nextcloud/metadata.py @@ -39,14 +39,6 @@ defaults = { 'admin_user': 'admin', 'admin_pass': repo.vault.password_for(f'{node.name} nextcloud admin pw'), }, - 'nginx': { - 'vhosts': { - 'nextcloud': { - 'webroot': '/opt/nextcloud', - 'php': True, - }, - }, - }, 'postgresql': { 'roles': { 'nextcloud': { @@ -70,3 +62,19 @@ defaults = { }, }, } + +# @metadata_reactor.provides( +# 'nginx/vhosts/nextcloud/domain', +# ) +# def nginx(metadata): +# return { +# 'nginx': { +# 'vhosts': { +# 'nextcloud': { +# 'domain': metadata.get('nextcloud/domain'), +# 'webroot': '/opt/nextcloud', +# 'php': True, +# }, +# }, +# }, +# } diff --git a/libs/nextcloud.py b/libs/nextcloud.py new file mode 100644 index 0000000..78e4086 --- /dev/null +++ b/libs/nextcloud.py @@ -0,0 +1,2 @@ +def occ(command, *args, **kwargs): + return f"""sudo -u www-data php /opt/nextcloud/occ {command} {' '.join(args)} {' '.join(f'--{name.replace("_", "-")}' + (f'={value}' if value else '') for name, value in kwargs.items())}""" diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py index 0717dce..0e30363 100644 --- a/nodes/htz.mails.py +++ b/nodes/htz.mails.py @@ -11,10 +11,15 @@ 'dnsserver', ], 'bundles': [ + 'nextcloud', 'wireguard', 'zfs', ], 'metadata': { + 'nextcloud': { + 'domain': 'cloud.sublimity.de', + 'version': '21.0.0', + }, 'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae', 'bind': { 'domain': 'ns.sublimity.de', @@ -86,10 +91,6 @@ # 'woodpipe.de', ], }, - 'nextcloud': { - 'version': '21.0.2', - 'sha256': '5e5b38109a3485db5fd2d248f24478eabe6c0790ec10b030acbbee207d5511fe', - }, 'roundcube': { 'product_name': 'Sublimity Mail', 'version': '1.4.11',