home.nas: change storage layout
This commit is contained in:
parent
a34f3a8d98
commit
af5a75e065
GPG key ID:
12E3D2136B818350
2 changed files with 38 additions and 63 deletions
|
|
@ -42,7 +42,7 @@ nodes['home.downloadhelper'] = {
|
|||
'mounts': {
|
||||
'storage': {
|
||||
'mountpoint': '/mnt/nas',
|
||||
'serverpath': '172.19.138.20:/storage/download',
|
||||
'serverpath': '172.19.138.20:/mnt/download',
|
||||
'mount_options': {
|
||||
'retry=0',
|
||||
'rw',
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ nodes['home.nas'] = {
|
|||
'bundles': {
|
||||
'avahi-daemon',
|
||||
'backup-client',
|
||||
'dm-crypt',
|
||||
'jellyfin',
|
||||
'lm-sensors',
|
||||
'mixcloud-downloader',
|
||||
|
|
@ -69,22 +68,6 @@ nodes['home.nas'] = {
|
|||
'avahi-aruba-fixup': '17,47 * * * * root /usr/bin/systemctl restart avahi-daemon.service',
|
||||
},
|
||||
},
|
||||
'dm-crypt': {
|
||||
'encrypted-devices': {
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409404K': {
|
||||
'dm-name': 'sam-S5SSNJ0X409404K',
|
||||
'passphrase': bwpass.password('bw/home.nas/dmcrypt/S5SSNJ0X409404K'),
|
||||
},
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409845F': {
|
||||
'dm-name': 'sam-S5SSNJ0X409845F',
|
||||
'passphrase': bwpass.password('bw/home.nas/dmcrypt/S5SSNJ0X409845F'),
|
||||
},
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409870J': {
|
||||
'dm-name': 'sam-S5SSNJ0X409870J',
|
||||
'passphrase': bwpass.password('bw/home.nas/dmcrypt/S5SSNJ0X409870J'),
|
||||
},
|
||||
},
|
||||
},
|
||||
'groups': {
|
||||
'nas': {},
|
||||
},
|
||||
|
|
@ -154,7 +137,7 @@ nodes['home.nas'] = {
|
|||
},
|
||||
'nfs-server': {
|
||||
'shares': {
|
||||
'/storage/download': {
|
||||
'/mnt/download': {
|
||||
'home.downloadhelper': 'rw,all_squash,anonuid=65534,anongid=1012,no_subtree_check',
|
||||
},
|
||||
'/storage/nas': {
|
||||
|
|
@ -192,7 +175,7 @@ nodes['home.nas'] = {
|
|||
'disks': {
|
||||
'/dev/nvme0',
|
||||
|
||||
# old nas disks
|
||||
# nas/timemachine disks
|
||||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V8GE15GR',
|
||||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V8HJ406R',
|
||||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V8HJBTLR',
|
||||
|
|
@ -200,10 +183,9 @@ nodes['home.nas'] = {
|
|||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V8J8ZKRR',
|
||||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V9JS5UYL',
|
||||
|
||||
# encrypted disks
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409404K',
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409845F',
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409870J',
|
||||
# ssdpool disks
|
||||
'/dev/disk/by-id/ata-INTEL_SSDSC2KB960G8_PHYF244001QU960CGN',
|
||||
'/dev/disk/by-id/ata-INTEL_SSDSC2KB960G8_PHYF244002AS960CGN',
|
||||
},
|
||||
},
|
||||
'systemd-networkd': {
|
||||
|
|
@ -258,6 +240,20 @@ nodes['home.nas'] = {
|
|||
'zfs_arc_max_gb': 8,
|
||||
},
|
||||
'pools': {
|
||||
'ssdpool': {
|
||||
'when_creating': {
|
||||
'config': [
|
||||
{
|
||||
'type': 'mirror',
|
||||
'devices': {
|
||||
'/dev/disk/by-id/ata-INTEL_SSDSC2KB960G8_PHYF244001QU960CGN',
|
||||
'/dev/disk/by-id/ata-INTEL_SSDSC2KB960G8_PHYF244002AS960CGN',
|
||||
},
|
||||
},
|
||||
],
|
||||
'ashift': 12,
|
||||
},
|
||||
},
|
||||
'tank': {
|
||||
'when_creating': {
|
||||
'config': [
|
||||
|
|
@ -276,67 +272,46 @@ nodes['home.nas'] = {
|
|||
'ashift': 12,
|
||||
},
|
||||
},
|
||||
'encrypted': {
|
||||
'when_creating': {
|
||||
'config': [
|
||||
{
|
||||
'type': 'raidz',
|
||||
'devices': {
|
||||
'/dev/mapper/sam-S5SSNJ0X409404K',
|
||||
'/dev/mapper/sam-S5SSNJ0X409845F',
|
||||
'/dev/mapper/sam-S5SSNJ0X409870J',
|
||||
},
|
||||
},
|
||||
],
|
||||
'ashift': 12,
|
||||
},
|
||||
'needs': {
|
||||
'action:dm-crypt_open_sam-S5SSNJ0X409404K',
|
||||
'action:dm-crypt_open_sam-S5SSNJ0X409845F',
|
||||
'action:dm-crypt_open_sam-S5SSNJ0X409870J',
|
||||
},
|
||||
# see comment in bundle:backup-server
|
||||
'unless': 'zpool import encrypted',
|
||||
},
|
||||
},
|
||||
'datasets': {
|
||||
'encrypted': {
|
||||
'ssdpool': {
|
||||
'primarycache': 'metadata',
|
||||
},
|
||||
'encrypted/nas': {
|
||||
'ssdpool/yate': {
|
||||
'mountpoint': '/opt/yate',
|
||||
},
|
||||
'ssdpool/download': {
|
||||
'mountpoint': '/mnt/download',
|
||||
'quota': '858993459200', # 800 GB
|
||||
},
|
||||
'ssdpool/paperless': {
|
||||
'mountpoint': '/srv/paperless',
|
||||
},
|
||||
'tank': {
|
||||
'primarycache': 'metadata',
|
||||
},
|
||||
'tank/nas': {
|
||||
'acltype': 'off',
|
||||
'atime': 'off',
|
||||
'compression': 'off',
|
||||
'mountpoint': '/storage/nas',
|
||||
},
|
||||
'tank': {
|
||||
'primarycache': 'metadata',
|
||||
},
|
||||
'tank/opt-yate': {
|
||||
'mountpoint': '/opt/yate',
|
||||
},
|
||||
'tank/download': {
|
||||
'mountpoint': '/storage/download',
|
||||
},
|
||||
'tank/paperless': {
|
||||
'mountpoint': '/srv/paperless',
|
||||
},
|
||||
},
|
||||
'snapshots': {
|
||||
'retain_per_dataset': {
|
||||
'encrypted/nas': {
|
||||
'tank/nas': {
|
||||
# juuuuuuuust to be sure.
|
||||
'daily': 14,
|
||||
'weekly': 6,
|
||||
'monthly': 12,
|
||||
},
|
||||
'tank/download': {
|
||||
'ssdpool/download': {
|
||||
'hourly': 48,
|
||||
'daily': 0,
|
||||
'weekly': 0,
|
||||
'monthly': 0,
|
||||
},
|
||||
'tank/paperless': {
|
||||
'ssdpool/paperless': {
|
||||
'daily': 14,
|
||||
'weekly': 6,
|
||||
'monthly': 24,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue