bundles/travelynx: update bundle for new version

This commit is contained in:
Franzi 2022-12-27 13:38:53 +01:00
parent 82143e34ad
commit 070b466abe
Signed by: kunsi
GPG key ID: 12E3D2136B818350
2 changed files with 10 additions and 21 deletions

View file

@ -5,15 +5,13 @@
# 'localhost'. # 'localhost'.
{ {
# Cache directories for schedule and realtime data. Mandatory. The parent base_url => Mojo::URL->new('https://${domain}'),
# directory ('/var/cache/travelynx' in this case) must already exist.
cache => { cache => {
schedule => '/var/cache/travelynx/iris', schedule => '/var/cache/travelynx/iris',
realtime => '/var/cache/travelynx/iris-rt', realtime => '/var/cache/travelynx/iris-rt',
}, },
# Database configuration. host and port are optional
# (defaulting to localhost:5432), the rest is mandatory.
db => { db => {
host => '${database.get('host', 'localhost')}', host => '${database.get('host', 'localhost')}',
port => 5432, port => 5432,
@ -22,8 +20,6 @@
password => '${database['password']}', password => '${database['password']}',
}, },
# See the Mojo::Server::Hypnotoad manual for details on the following
# settings.
hypnotoad => { hypnotoad => {
accepts => 100, accepts => 100,
clients => 10, clients => 10,
@ -34,21 +30,14 @@
}, },
mail => { mail => {
# If you want to disable outgoing mail for development purposes,
# uncomment the following line. Mails will instead be logged as
# Mojolicious "info" messages, causing their content to be printed on
# stdout.
## disabled => 1,
# Otherwise, specify the sender ("From" field) for mail sent by travelynx
# here. E.g. 'Travelynx <mail@example.org>'
from => '${mail_from}', from => '${mail_from}',
}, },
# Secrets used for cookie signing and verification. Must contain at least ref => {
# one random string. If you specify several strings, the first one will issues => 'https://github.com/derf/travelynx/issues',
# be used for signing new cookies, and the remaining ones will still be source => 'https://github.com/derf/travelynx',
# accepted for cookie validation. },
secrets => [ secrets => [
'${cookie_secret}', '${cookie_secret}',
], ],

View file

@ -36,7 +36,7 @@ files = {
}, },
'/opt/travelynx/travelynx.conf': { '/opt/travelynx/travelynx.conf': {
'content_type': 'mako', 'content_type': 'mako',
'context': node.metadata['travelynx'], 'context': node.metadata.get('travelynx'),
'needs': { 'needs': {
'git_deploy:/opt/travelynx', 'git_deploy:/opt/travelynx',
}, },
@ -61,7 +61,7 @@ if isfile(join(repo.path, 'data', 'travelynx', 'files', 'imprint', node.name)):
git_deploy = { git_deploy = {
'/opt/travelynx': { '/opt/travelynx': {
'repo': 'https://github.com/derf/travelynx.git', 'repo': 'https://github.com/derf/travelynx.git',
'rev': node.metadata['travelynx']['version'], 'rev': node.metadata.get('travelynx/version'),
'needs': { 'needs': {
'directory:/opt/travelynx', 'directory:/opt/travelynx',
}, },
@ -84,7 +84,7 @@ actions = {
'triggered': True, 'triggered': True,
}, },
'travelynx_database_migrate': { 'travelynx_database_migrate': {
'command': 'cd /opt/travelynx && perl index.pl database migrate', 'command': 'export PERL5LIB=/opt/travelynx/local/lib/perl5; cd /opt/travelynx && perl index.pl database migrate',
# Because git_deploy does not put .git onto the server, the script # Because git_deploy does not put .git onto the server, the script
# will complain on STDERR about not finding a git repository. # will complain on STDERR about not finding a git repository.
# That's why we need to redirect stderr to /dev/null. # That's why we need to redirect stderr to /dev/null.