diff options
| author | quentin@aristote.fr <quentin@aristote.fr> | 2026-10-04 19:38:53 +0200 |
|---|---|---|
| committer | quentin@aristote.fr <quentin@aristote.fr> | 2026-10-04 20:53:05 +0200 |
| commit | 3cf3a1d78106aa44d694f4203905681492da9913 (patch) | |
| tree | 4b1792a55442a178980785cc7a0a7c9b7e6d3817 | |
| parent | 32317bcba1c1bbaae069bef76e7f3e4380b185fa (diff) | |
| download | hermes-3cf3a1d78106aa44d694f4203905681492da9913.tar.gz hermes-3cf3a1d78106aa44d694f4203905681492da9913.tar.bz2 hermes-3cf3a1d78106aa44d694f4203905681492da9913.tar.xz | |
git: move hephaistos to new machine
| -rw-r--r-- | config/services/web/git/default.nix | 3 | ||||
| -rw-r--r-- | tests/configuration.nix | 10 | ||||
| -rwxr-xr-x | tests/run-tests.sh | 23 |
3 files changed, 9 insertions, 27 deletions
diff --git a/config/services/web/git/default.nix b/config/services/web/git/default.nix index 566be62..995d974 100644 --- a/config/services/web/git/default.nix +++ b/config/services/web/git/default.nix @@ -7,7 +7,8 @@ enableACME = true; forceSSL = true; locations."/" = { - proxyPass = "http://100.64.0.6/git/"; # hephaistos.aristote.mesh + # proxyPass as an IP so nginx doesn't fail if the upstream isn't available + proxyPass = "http://100.64.0.3/git/"; # hephaistos.aristote.mesh extraConfig = '' proxy_redirect default; # fix internal hyperlinks diff --git a/tests/configuration.nix b/tests/configuration.nix index 3944dcd..8af5c28 100644 --- a/tests/configuration.nix +++ b/tests/configuration.nix @@ -51,12 +51,10 @@ in services.nginx.virtualHosts = { quentin = nginxMakeLocal 8080; searx = nginxMakeLocal 8081; - rss = nginxMakeLocal 8083; - webkeydirectory = nginxMakeLocal 8084; - mesh = nginxMakeLocal 8085; - git = nginxMakeLocal 8086 // { - locations."/".proxyPass = lib.mkForce "http://192.168.2.2/git/"; - }; + rss = nginxMakeLocal 8082; + webkeydirectory = nginxMakeLocal 8083; + mesh = nginxMakeLocal 8084; + git = lib.mkForce { }; }; environment.etc = { diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 36ce4f7..e69fa8f 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -26,8 +26,7 @@ echo Checking that all the services are running : declare -A PORTS PORTS[quentin]=8080 PORTS[searx]=8081 -PORTS[rss]=8083 -PORTS[git]=8086 +PORTS[rss]=8082 for SERVICE in "${!PORTS[@]}" do URL="http://$IP:${PORTS[$SERVICE]}/" @@ -41,7 +40,7 @@ do fi done echo Checking connection to container version of mesh.aristote.fr ... -URL="http://$IP:8085/health" +URL="http://$IP:8084/health" RESULT=$(curl "$URL" $CURL_FLAGS) if [[ "$RESULT" != '{"status":"pass"}' ]] then @@ -54,7 +53,7 @@ echo Done. echo echo Checking web keys directory : -URL_PREFIX="http://$IP:8084/.well-known/openpgpkey/aristote.vm" +URL_PREFIX="http://$IP:8083/.well-known/openpgpkey/aristote.vm" KEYS="$(ls ../config/services/web/webkeydirectory/hu)" for KEY in $KEYS do @@ -75,22 +74,6 @@ echo Done. echo -echo Checking cgit instance: -RESULT=$(curl "http://$IP:${PORTS[git]}/" $CURL_FLAGS) -echo "Checking that internal hyperlinks don't start with 'git' ..." -if $(echo "$RESULT" | grep --silent "=\'/git/") -then - echo "Broken hyperlinks detected." -fi -echo Checking that the default view of repositories is their tree ... -if $(echo "$RESULT" | grep --silent "href='/[^/]*/[^/]*/'") -then - echo "Broken hyperlinks detected." -fi -echo Done. - - -echo echo Checking custom RSS bridges : BRIDGES="$(ls ../config/services/web/rss/*Bridge.php | xargs basename -s Bridge.php)" for BRIDGE in $BRIDGES |