diff --git a/bundles/travelynx/files/travelynx.conf b/bundles/travelynx/files/travelynx.conf index 7787d8b..46883cf 100644 --- a/bundles/travelynx/files/travelynx.conf +++ b/bundles/travelynx/files/travelynx.conf @@ -40,6 +40,9 @@ secrets => [ '${cookie_secret}', +% for i in sorted(additional_cookie_secrets): + '${i}', +% endfor ], version => '${version}', diff --git a/bundles/travelynx/files/travelynx.service b/bundles/travelynx/files/travelynx.service index 6c7b4f2..53aec53 100644 --- a/bundles/travelynx/files/travelynx.service +++ b/bundles/travelynx/files/travelynx.service @@ -8,9 +8,9 @@ Type=simple RemainAfterExit=yes PIDFile=/var/cache/travelynx/travelynx.pid -ExecStart=/usr/local/bin/hypnotoad -f index.pl -ExecStop=/usr/local/bin/hypnotoad -s index.pl -ExecReload=/usr/local/bin/hypnotoad index.pl +ExecStart=/usr/bin/hypnotoad -f index.pl +ExecStop=/usr/bin/hypnotoad -s index.pl +ExecReload=/usr/bin/hypnotoad index.pl User=travelynx WorkingDirectory=/opt/travelynx diff --git a/bundles/travelynx/items.py b/bundles/travelynx/items.py index 5463a1b..9a03785 100644 --- a/bundles/travelynx/items.py +++ b/bundles/travelynx/items.py @@ -20,14 +20,14 @@ directories = { } files = { - '/etc/systemd/system/travelynx.service': { + '/usr/local/lib/systemd/system/travelynx.service': { 'triggers': { 'action:systemd-reload', 'svc_systemd:travelynx:restart', 'svc_systemd:travelynx-worker:restart', }, }, - '/etc/systemd/system/travelynx-worker.service': { + '/usr/local/lib/systemd/system/travelynx-worker.service': { 'triggers': { 'action:systemd-reload', 'svc_systemd:travelynx:restart', @@ -102,14 +102,15 @@ actions = { svc_systemd = { 'travelynx': { 'needs': { - 'file:/etc/systemd/system/travelynx.service', + 'file:/usr/local/lib/systemd/system/travelynx.service', 'action:travelynx_database_migrate', 'directory:/var/cache/travelynx', + 'pkg_apt:libmojolicious-perl', }, }, 'travelynx-worker': { 'needs': { - 'file:/etc/systemd/system/travelynx-worker.service', + 'file:/usr/local/lib/systemd/system/travelynx-worker.service', 'svc_systemd:travelynx', }, }, diff --git a/bundles/travelynx/metadata.py b/bundles/travelynx/metadata.py index 969b0cd..b7dadd6 100644 --- a/bundles/travelynx/metadata.py +++ b/bundles/travelynx/metadata.py @@ -1,4 +1,9 @@ defaults = { + 'apt': { + 'packages': { + 'libmojolicious-perl': {}, + }, + }, 'travelynx': { 'database': { 'username': 'travelynx', @@ -9,6 +14,7 @@ defaults = { 'spare_workers': 2, 'mail_from': 'travelynx@{}'.format(node.hostname), 'cookie_secret': repo.vault.password_for('{} travelynx cookie_secret'.format(node.name)), + 'additional_cookie_secrets': set(), }, 'postgresql': { 'roles': {