nixos/invoiceplane: Enable clean url

authored by Jonas Heinrich and committed by Yt f7f94426 59f6a930

+9 -9
+3 -3
nixos/modules/services/web-apps/invoiceplane.nix
··· 25 ENCRYPTION_KEY= 26 ENCRYPTION_CIPHER=AES-256 27 SETUP_COMPLETED=false 28 ''; 29 30 extraConfig = hostName: cfg: pkgs.writeText "extraConfig.php" '' ··· 331 serviceConfig = { 332 Type = "oneshot"; 333 User = user; 334 - ExecStart = "${pkgs.curl}/bin/curl --header 'Host: ${hostName}' http://localhost/index.php/invoices/cron/recur/${cfg.cron.key}"; 335 }; 336 }) 337 )) eachSite); ··· 344 virtualHosts = mapAttrs' (hostName: cfg: ( 345 nameValuePair "http://${hostName}" { 346 extraConfig = '' 347 - root * ${pkg hostName cfg} 348 file_server 349 - 350 php_fastcgi unix/${config.services.phpfpm.pools."invoiceplane-${hostName}".socket} 351 ''; 352 }
··· 25 ENCRYPTION_KEY= 26 ENCRYPTION_CIPHER=AES-256 27 SETUP_COMPLETED=false 28 + REMOVE_INDEXPHP=true 29 ''; 30 31 extraConfig = hostName: cfg: pkgs.writeText "extraConfig.php" '' ··· 332 serviceConfig = { 333 Type = "oneshot"; 334 User = user; 335 + ExecStart = "${pkgs.curl}/bin/curl --header 'Host: ${hostName}' http://localhost/invoices/cron/recur/${cfg.cron.key}"; 336 }; 337 }) 338 )) eachSite); ··· 345 virtualHosts = mapAttrs' (hostName: cfg: ( 346 nameValuePair "http://${hostName}" { 347 extraConfig = '' 348 + root * ${pkg hostName cfg} 349 file_server 350 php_fastcgi unix/${config.services.phpfpm.pools."invoiceplane-${hostName}".socket} 351 ''; 352 }
+6 -6
nixos/tests/invoiceplane.nix
··· 46 47 with subtest("Finish InvoicePlane setup"): 48 machine.succeed( 49 - f"curl -sSfL --cookie-jar cjar {site_name}/index.php/setup/language" 50 ) 51 csrf_token = machine.succeed( 52 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 53 ) 54 machine.succeed( 55 - f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&ip_lang=english&btn_continue=Continue' {site_name}/index.php/setup/language" 56 ) 57 csrf_token = machine.succeed( 58 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 59 ) 60 machine.succeed( 61 - f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/index.php/setup/prerequisites" 62 ) 63 csrf_token = machine.succeed( 64 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 65 ) 66 machine.succeed( 67 - f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/index.php/setup/configure_database" 68 ) 69 csrf_token = machine.succeed( 70 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 71 ) 72 machine.succeed( 73 - f"curl -sSfl --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/index.php/setup/install_tables" 74 ) 75 csrf_token = machine.succeed( 76 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 77 ) 78 machine.succeed( 79 - f"curl -sSfl --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/index.php/setup/upgrade_tables" 80 ) 81 ''; 82 })
··· 46 47 with subtest("Finish InvoicePlane setup"): 48 machine.succeed( 49 + f"curl -sSfL --cookie-jar cjar {site_name}/setup/language" 50 ) 51 csrf_token = machine.succeed( 52 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 53 ) 54 machine.succeed( 55 + f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&ip_lang=english&btn_continue=Continue' {site_name}/setup/language" 56 ) 57 csrf_token = machine.succeed( 58 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 59 ) 60 machine.succeed( 61 + f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/setup/prerequisites" 62 ) 63 csrf_token = machine.succeed( 64 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 65 ) 66 machine.succeed( 67 + f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/setup/configure_database" 68 ) 69 csrf_token = machine.succeed( 70 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 71 ) 72 machine.succeed( 73 + f"curl -sSfl --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/setup/install_tables" 74 ) 75 csrf_token = machine.succeed( 76 "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'" 77 ) 78 machine.succeed( 79 + f"curl -sSfl --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/setup/upgrade_tables" 80 ) 81 ''; 82 })