cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
mwiegand 2021-07-01 00:41:20 +02:00
parent fb1c7a2bcc
commit c84467c033
4 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
bundles/nextcloud/files/managed.config.php
View file

@ -1,19 +1,24 @@
<?php <?php
# https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/config_sample_php_parameters.html#multiple-config-php-file # https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/config_sample_php_parameters.html#multiple-config-php-file
$CONFIG = array ( $CONFIG = array (
'dbuser' => 'nextcloud', "dbuser" => "nextcloud",
'dbpassword' => '${db_password}', "dbpassword" => "${db_password}",
'dbname' => 'nextcloud', "dbname" => "nextcloud",
'dbhost' => 'localhost', "dbhost" => "localhost",
'dbtype' => 'pgsql', "dbtype" => "pgsql",
'datadirectory' => '/var/lib/nextcloud', "datadirectory" => "/var/lib/nextcloud",
'dbport' => '5432', "dbport" => "5432",
'apps_paths' => [ "apps_paths" => [
[ [
'path'=> '/var/lib/nextcloud/.apps', "path" => "/opt/nextcloud/apps",
'url' => '/userapps', "url" => "/apps",
'writable' => true, "writable" => false,
],
[
"path" => "/var/lib/nextcloud/.userapps",
"url" => "/userapps",
"writable" => true,
], ],
], ],
'cache_path' => '/var/lib/nextcloud/.cache', "cache_path" => "/var/lib/nextcloud/.cache",
); );

12
bundles/nextcloud/items.py
View file

@ -17,7 +17,7 @@ directories = {
'group': 'www-data', 'group': 'www-data',
'mode': '770', 'mode': '770',
}, },
'/var/lib/nextcloud/.apps': { '/var/lib/nextcloud/.userapps': {
'owner': 'www-data', 'owner': 'www-data',
'group': 'www-data', 'group': 'www-data',
}, },
@ -29,15 +29,15 @@ directories = {
downloads[f'/tmp/nextcloud-{version}.tar.bz2'] = { downloads[f'/tmp/nextcloud-{version}.tar.bz2'] = {
'url': f'https://download.nextcloud.com/server/releases/nextcloud-{version}.tar.bz2', 'url': f'https://download.nextcloud.com/server/releases/nextcloud-{version}.tar.bz2',
'sha256_url': f'https://download.nextcloud.com/server/releases/nextcloud-{version}.tar.bz2.sha256', 'sha256_url': '{url}.sha256',
'triggered': True, 'triggered': True,
} }
actions['delete_nextcloud'] = { actions['delete_nextcloud'] = {
'command': 'rm -rf /opt/nextcloud/{.*,*}', 'command': 'rm -rf /opt/nextcloud/*',
'triggered': True, 'triggered': True,
} }
actions['extract_nextcloud'] = { actions['extract_nextcloud'] = {
'command': f'tar xfvj /tmp/nextcloud-{version}.tar.bz2 --skip-old-files --strip 1 -C /opt/nextcloud nextcloud', 'command': f'tar xfvj /tmp/nextcloud-{version}.tar.bz2 --strip 1 -C /opt/nextcloud nextcloud',
'unless': f"""php -r 'include "/opt/nextcloud/version.php"; echo "$OC_VersionString";' | grep -q '^{version}$'""", 'unless': f"""php -r 'include "/opt/nextcloud/version.php"; echo "$OC_VersionString";' | grep -q '^{version}$'""",
'preceded_by': [ 'preceded_by': [
'action:delete_nextcloud', 'action:delete_nextcloud',
@ -58,7 +58,7 @@ symlinks = {
], ],
}, },
'/opt/nextcloud/userapps': { '/opt/nextcloud/userapps': {
'target': '/var/lib/nextcloud/.apps', 'target': '/var/lib/nextcloud/.userapps',
'owner': 'www-data', 'owner': 'www-data',
'group': 'www-data', 'group': 'www-data',
'needs': [ 'needs': [
@ -116,7 +116,7 @@ actions['install_nextcloud'] = {
'directory:/etc/nextcloud', 'directory:/etc/nextcloud',
'directory:/opt/nextcloud', 'directory:/opt/nextcloud',
'directory:/var/lib/nextcloud', 'directory:/var/lib/nextcloud',
'directory:/var/lib/nextcloud/.apps', 'directory:/var/lib/nextcloud/.userapps',
'directory:/var/lib/nextcloud/.cache', 'directory:/var/lib/nextcloud/.cache',
'symlink:/opt/nextcloud/config', 'symlink:/opt/nextcloud/config',
'symlink:/opt/nextcloud/userapps', 'symlink:/opt/nextcloud/userapps',

3
items/download.py
View file

@ -84,8 +84,9 @@ class Download(Item):
if 'sha256' in self.attributes: if 'sha256' in self.attributes:
sdict['sha256'] = self.attributes['sha256'] sdict['sha256'] = self.attributes['sha256']
elif 'sha256_url' in self.attributes: elif 'sha256_url' in self.attributes:
sha256_url = self.attributes['sha256_url'].format(url=self.attributes['url'])
sdict['sha256'] = force_text( sdict['sha256'] = force_text(
self.node.run(f"curl -L -s -- {quote(self.attributes['sha256_url'])}").stdout self.node.run(f"curl -L -s -- {quote(sha256_url)}").stdout
).strip().split()[0] ).strip().split()[0]
return sdict return sdict

3
nodes/htz.mails.py
View file

@ -18,8 +18,7 @@
'metadata': { 'metadata': {
'nextcloud': { 'nextcloud': {
'domain': 'cloud.sublimity.de', 'domain': 'cloud.sublimity.de',
'version': '20.0.5', 'version': '20.0.0',
'sha256': '5e5b38109a3485db5fd2d248f24478eabe6c0790ec10b030acbbee207d5511fe',
}, },
'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae', 'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
'bind': { 'bind': {