diff --git a/bundles/freescout/README.md b/bundles/freescout/README.md new file mode 100644 index 0000000..c6f42e4 --- /dev/null +++ b/bundles/freescout/README.md @@ -0,0 +1,13 @@ +Pg Pass workaround: set manually: + +``` +root@freescout /ro psql freescout +psql (15.6 (Debian 15.6-0+deb12u1)) +Type "help" for help. + +freescout=# \password freescout +Enter new password for user "freescout": +Enter it again: +freescout=# +\q +``` diff --git a/bundles/freescout/items.py b/bundles/freescout/items.py index 560c60d..14b947f 100644 --- a/bundles/freescout/items.py +++ b/bundles/freescout/items.py @@ -41,19 +41,22 @@ actions = { }, } -files = { - '/opt/freescout/.env': { - # https://github.com/freescout-helpdesk/freescout/blob/dist/.env.example - # Every time you are making changes in .env file, in order changes to take an effect you need to run: - # ´sudo su - www-data -c 'php /opt/freescout/artisan freescout:clear-cache' -s /bin/bash´ - 'owner': 'www-data', - 'content': '\n'.join( - f'{k}={v}' for k, v in - sorted(node.metadata.get('freescout/env').items()) - ) + '\n', - 'needs': [ - 'directory:/opt/freescout', - 'action:clone_freescout', - ], - }, -} +# files = { +# '/opt/freescout/.env': { +# # https://github.com/freescout-helpdesk/freescout/blob/dist/.env.example +# # Every time you are making changes in .env file, in order changes to take an effect you need to run: +# # ´sudo su - www-data -c 'php /opt/freescout/artisan freescout:clear-cache' -s /bin/bash´ +# 'owner': 'www-data', +# 'content': '\n'.join( +# f'{k}={v}' for k, v in +# sorted(node.metadata.get('freescout/env').items()) +# ) + '\n', +# 'needs': [ +# 'directory:/opt/freescout', +# 'action:clone_freescout', +# ], +# }, +# } + +#sudo su - www-data -s /bin/bash -c 'php /opt/freescout/artisan freescout:create-user --role admin --firstName M --lastName W --email freescout@freibrief.net --password gyh.jzv2bnf6hvc.HKG --no-interaction' +#sudo su - www-data -s /bin/bash -c 'php /opt/freescout/artisan freescout:create-user --role admin --firstName M --lastName W --email freescout@freibrief.net --password gyh.jzv2bnf6hvc.HKG --no-interaction' diff --git a/bundles/freescout/metadata.py b/bundles/freescout/metadata.py index 3a803f6..e07d7c9 100644 --- a/bundles/freescout/metadata.py +++ b/bundles/freescout/metadata.py @@ -47,6 +47,13 @@ defaults = { }, }, }, + 'systemd-timers': { + 'freescout-cron': { + 'command': '/usr/bin/php /opt/freescout/artisan schedule:run', + 'when': 'Minutely', + 'user': 'www-data', + }, + }, 'zfs': { 'datasets': { 'tank/freescout': { diff --git a/nodes/home.server.py b/nodes/home.server.py index dc0737f..ea13ec4 100644 --- a/nodes/home.server.py +++ b/nodes/home.server.py @@ -174,7 +174,7 @@ '10.0.10.0/24', '10.0.11.0/24', '192.168.179.0/24', - '10.0.238.0/24', # mseibert.freescout + '10.0.227.0/24', # mseibert.freescout ], }, }, diff --git a/nodes/mseibert.freescout.py b/nodes/mseibert.freescout.py index 3c1c722..61bbebd 100644 --- a/nodes/mseibert.freescout.py +++ b/nodes/mseibert.freescout.py @@ -1,9 +1,9 @@ { - 'hostname': '88.198.202.28', + 'hostname': '159.69.117.89', 'groups': [ - 'backup', +# 'backup', 'debian-12', - 'monitored', +# 'monitored', 'webserver', 'freescout', ], @@ -16,13 +16,13 @@ 'network': { 'internal': { 'interface': 'ens10', - 'ipv4': '10.0.238.2/32', + 'ipv4': '10.0.227.2/24', }, 'external': { 'interface': 'eth0', - 'ipv4': '88.198.202.28/32', + 'ipv4': '159.69.117.89/32', 'gateway4': '172.31.1.1', - 'ipv6': '2a01:4f8:c012:8e8f::1/64', + 'ipv6': '2a01:4f8:c013:3d0b::1/64', 'gateway6': 'fe80::1', }, }, @@ -51,7 +51,7 @@ 'pools': { 'tank': { 'devices': [ - '/dev/disk/by-id/scsi-0HC_Volume_100356294', + '/dev/disk/by-id/scsi-0HC_Volume_100662393', ], }, }, diff --git a/nodes/netcup.mails.py b/nodes/netcup.mails.py index 65b73a4..ac64d81 100644 --- a/nodes/netcup.mails.py +++ b/nodes/netcup.mails.py @@ -219,7 +219,7 @@ }, 'mseibert.freescout': { 'allowed_ips': [ - '10.0.238.0/24', + '10.0.227.0/24', ], }, },