kunsi/bundlewrap
1
0
Fork 0
Code Issues 2 Pull requests 1 Releases Activity

items/zfs_dataset: add automatic dependency for all files, directories and git_deploy of a dataset

Browse source
This commit is contained in:
Franzi 2021-07-17 09:10:56 +02:00
parent b3e322ae08
commit 1086ed28c3
Signed by: kunsi
GPG key ID: 12E3D2136B818350
6 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bundles/backup-server/items.py
View file

@ -14,15 +14,9 @@ for nodename, config in node.metadata.get('backup-server/clients', {}).items():
'content': pubkey,
'owner': config['user'],
'mode': '0400',
'needs': {
'bundle:zfs',
},
}
directories[f'/srv/backups/{nodename}/backups'] = {
'owner': config['user'],
'mode': '0700',
'needs': {
'bundle:zfs',
},
}

3
bundles/element-web/metadata.py
View file

@ -3,9 +3,6 @@ defaults = {
'datasets': {
'tank/element-web': {
'mountpoint': '/opt/element-web',
'needed_by': {
'directory:/opt/element-web',
},
},
},
},

6
bundles/gitea/metadata.py
View file

@ -50,15 +50,9 @@ defaults = {
'tank/gitea': {},
'tank/gitea/home': {
'mountpoint': '/home/git',
'needed_by': {
'directory:/home/git',
},
},
'tank/gitea/var': {
'mountpoint': '/var/lib/gitea',
'needed_by': {
'directory:/var/lib/gitea',
},
},
},
},

9
bundles/nginx/items.py
View file

@ -139,14 +139,7 @@ for vhost, config in node.metadata.get('nginx/vhosts', {}).items():
}
if not 'webroot' in config:
directories[f'/var/www/{vhost}'] = {}
if node.has_bundle('zfs'):
directories[f'/var/www/{vhost}']['needs'] = {
'bundle:zfs',
}
directories[f'/var/www/{vhost}'].update(config.get('webroot_config', {}))
directories[f'/var/www/{vhost}'] = config.get('webroot_config', {})
if config.get('ssl', 'letsencrypt') == 'letsencrypt':
files[f'/etc/nginx/sites/{vhost}']['needs'].add('action:letsencrypt_ensure-some-certificate_{}'.format(config['domain']))

5
bundles/scansnap/items.py
View file

@ -8,11 +8,6 @@ directories = {
},
}
if node.has_bundle('zfs'):
directories['/srv/scansnap']['needs'] = {
'bundle:zfs',
}
files = {
'/etc/scanbd/scanbd.conf': {
'triggers': {

8
items/zfs_dataset.py
View file

@ -119,6 +119,14 @@ class ZFSDataset(Item):
# XXX Could be optimized by finding the "largest"
# parent only.
yield item.id
elif self.attributes.get('mountpoint'):
for item_type in ['directory', 'file', 'git_deploy']:
if (
item.ITEM_TYPE_NAME == item_type and
item.name.startswith('{}:{}'.format(item_type, self.attributes['mountpoint']))
):
yield item.id
if not pool_item_found:
raise BundleError(_(