X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fwallabag.nix;h=4bda8089a5d3df7c196a25e4f5f71209478defaf;hb=6f4574e7b57043340a2a520c4bbeb17dde72e0ea;hp=d742c5d3ad313538247567f3698e505d65a6cb4a;hpb=a3d281ea34a6e3c66789455c1c1edf223030a589;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/virtual/modules/websites/tools/tools/wallabag.nix b/virtual/modules/websites/tools/tools/wallabag.nix index d742c5d..4bda808 100644 --- a/virtual/modules/websites/tools/tools/wallabag.nix +++ b/virtual/modules/websites/tools/tools/wallabag.nix @@ -7,10 +7,10 @@ let parameters: database_driver: pdo_pgsql database_driver_class: Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver - database_host: db-1.immae.eu - database_port: null - database_name: webapps - database_user: wallabag + database_host: ${env.postgresql.socket} + database_port: ${env.postgresql.port} + database_name: ${env.postgresql.database} + database_user: ${env.postgresql.user} database_password: ${env.postgresql.password} database_path: null database_table_prefix: wallabag_ @@ -34,10 +34,10 @@ let rabbitmq_user: guest rabbitmq_password: guest rabbitmq_prefetch_count: 10 - redis_scheme: tcp - redis_host: localhost - redis_port: 6379 - redis_path: null + redis_scheme: unix + redis_host: null + redis_port: null + redis_path: ${env.redis.socket} redis_password: null sites_credentials: { } ldap_enabled: true @@ -119,12 +119,13 @@ let fi ''; webRoot = "${webappDir}/web"; + # Domain migration: Table wallabag_entry contains whole + # https://tools.immae.eu/wallabag domain name in preview_picture apache = { user = "wwwrun"; group = "wwwrun"; modules = [ "proxy_fcgi" ]; vhostConf = '' - Alias /assets "${varDir}/assets" Alias /wallabag "${webRoot}" AllowOverride None