diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix
index 9c3d69b..bf99a8f 100644
--- a/modules/nextcloud/default.nix
+++ b/modules/nextcloud/default.nix
@@ -70,7 +70,7 @@
};
settings = {
- overwrite.cli.url = "http://cloud.${config.pub-solar-os.networking.domain}";
+ overwrite.cli.url = "https://cloud.${config.pub-solar-os.networking.domain}";
overwriteprotocol = "https";
installed = true;
@@ -130,7 +130,7 @@
auth.bruteforce.protection.enabled = true;
trashbin_retention_obligation = "auto,7";
- skeletondirectory = "./nextcloud-skeleton";
+ skeletondirectory = "${pkgs.nextcloud-skeleton}/{lang}";
defaultapp = "file";
activity_expire_days = "14";
integrity.check.disabled = false;
diff --git a/modules/nextcloud/nextcloud-skeleton/Documents/Example.odt b/modules/nextcloud/nextcloud-skeleton/Documents/Example.odt
deleted file mode 100644
index 852646e..0000000
Binary files a/modules/nextcloud/nextcloud-skeleton/Documents/Example.odt and /dev/null differ
diff --git a/modules/nextcloud/nextcloud-skeleton/Pictures/pubsolar.png b/modules/nextcloud/nextcloud-skeleton/Pictures/pubsolar.png
deleted file mode 100644
index 5b4fe09..0000000
Binary files a/modules/nextcloud/nextcloud-skeleton/Pictures/pubsolar.png and /dev/null differ
diff --git a/overlays/default.nix b/overlays/default.nix
index 30e03e5..f9c3039 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -17,6 +17,7 @@
element-stickerpicker = prev.callPackage ./pkgs/element-stickerpicker {
inherit (inputs) element-stickers maunium-stickerpicker;
};
+ nextcloud-skeleton = prev.callPackage ./pkgs/nextcloud-skeleton { };
}
)
];
diff --git a/overlays/pkgs/nextcloud-skeleton/de/Dokumente/Beispiel.odt b/overlays/pkgs/nextcloud-skeleton/de/Dokumente/Beispiel.odt
new file mode 100644
index 0000000..02ccc4b
Binary files /dev/null and b/overlays/pkgs/nextcloud-skeleton/de/Dokumente/Beispiel.odt differ
diff --git a/overlays/pkgs/nextcloud-skeleton/de/Fotos/pubsolar.png b/overlays/pkgs/nextcloud-skeleton/de/Fotos/pubsolar.png
new file mode 100644
index 0000000..98a1fa4
Binary files /dev/null and b/overlays/pkgs/nextcloud-skeleton/de/Fotos/pubsolar.png differ
diff --git a/modules/nextcloud/nextcloud-skeleton/Pictures/pubsolar.svg b/overlays/pkgs/nextcloud-skeleton/de/Fotos/pubsolar.svg
similarity index 99%
rename from modules/nextcloud/nextcloud-skeleton/Pictures/pubsolar.svg
rename to overlays/pkgs/nextcloud-skeleton/de/Fotos/pubsolar.svg
index aa84e45..02b4a13 100644
--- a/modules/nextcloud/nextcloud-skeleton/Pictures/pubsolar.svg
+++ b/overlays/pkgs/nextcloud-skeleton/de/Fotos/pubsolar.svg
@@ -4,7 +4,7 @@
data-name="Layer 3"
viewBox="0 0 275.3 276.37"
version="1.1"
- sodipodi:docname="pubsolar.svg"
+ sodipodi:docname="pub.solar.svg"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
diff --git a/overlays/pkgs/nextcloud-skeleton/de/Liesmich.md b/overlays/pkgs/nextcloud-skeleton/de/Liesmich.md
new file mode 100644
index 0000000..f2c38ed
--- /dev/null
+++ b/overlays/pkgs/nextcloud-skeleton/de/Liesmich.md
@@ -0,0 +1,7 @@
+# Willkommen zu deiner pub.solar Cloud!
+
+Standardmässig ist die Cloud auf 10MB Speicherplatz begrenzt. Wenn Du mehr zur Verfügung haben möchtest, sende uns gerne eine kurze Mail an [crew@pub.solar](mailto:crew@pub.solar).
+
+Zum Download von Nextcloud Desktop Clients, besuche bitte https://nextcloud.com/download. Eine Anleitung zur Einrichtung findest Du hier in unserem [Wiki zu Nextcloud](https://wiki.pub.solar/index.php/Nextcloud).
+
+Du kannst diese Datei bearbeiten, indem Du den Text hier anklickst und zum Beispiel Notizen für dieses Verzeichnis schreiben : )
diff --git a/overlays/pkgs/nextcloud-skeleton/default.nix b/overlays/pkgs/nextcloud-skeleton/default.nix
new file mode 100644
index 0000000..062ac7c
--- /dev/null
+++ b/overlays/pkgs/nextcloud-skeleton/default.nix
@@ -0,0 +1,29 @@
+# Based on:
+# https://nix.dev/tutorials/working-with-local-files.html#union-explicitly-include-files
+{
+ stdenvNoCC,
+ lib,
+}:
+let
+ fs = lib.fileset;
+ sourceFiles = fs.unions [
+ ./default/Documents/Example.odt
+ ./default/Pictures/pubsolar.png
+ ./default/Pictures/pubsolar.svg
+ ./default/Readme.md
+ ./de/Dokumente/Beispiel.odt
+ ./de/Fotos/pubsolar.png
+ ./de/Fotos/pubsolar.svg
+ ./de/Liesmich.md
+ ];
+in
+stdenvNoCC.mkDerivation {
+ name = "nextcloud-skeleton";
+ src = fs.toSource {
+ root = ./.;
+ fileset = sourceFiles;
+ };
+ postInstall = ''
+ cp -vr . $out
+ '';
+}
diff --git a/overlays/pkgs/nextcloud-skeleton/default/Documents/Example.odt b/overlays/pkgs/nextcloud-skeleton/default/Documents/Example.odt
new file mode 100644
index 0000000..d1878b5
Binary files /dev/null and b/overlays/pkgs/nextcloud-skeleton/default/Documents/Example.odt differ
diff --git a/overlays/pkgs/nextcloud-skeleton/default/Pictures/pubsolar.png b/overlays/pkgs/nextcloud-skeleton/default/Pictures/pubsolar.png
new file mode 100644
index 0000000..98a1fa4
Binary files /dev/null and b/overlays/pkgs/nextcloud-skeleton/default/Pictures/pubsolar.png differ
diff --git a/overlays/pkgs/nextcloud-skeleton/default/Pictures/pubsolar.svg b/overlays/pkgs/nextcloud-skeleton/default/Pictures/pubsolar.svg
new file mode 100644
index 0000000..02b4a13
--- /dev/null
+++ b/overlays/pkgs/nextcloud-skeleton/default/Pictures/pubsolar.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ id="Layer_3"
+ data-name="Layer 3"
+ viewBox="0 0 275.3 276.37"
+ version="1.1"
+ sodipodi:docname="pub.solar.svg"
+ inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <sodipodi:namedview
+ id="namedview226"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="0"
+ showgrid="false"
+ inkscape:zoom="4.3962803"
+ inkscape:cx="95.762774"
+ inkscape:cy="149.33079"
+ inkscape:window-width="2560"
+ inkscape:window-height="1380"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_3" />
+ <defs
+ id="defs197">
+ <style
+ id="style195">.cls-1,.cls-2{fill:#ed1c24;}.cls-1{stroke:#ed1c24;stroke-width:6.89px;}.cls-1,.cls-2,.cls-4{stroke-miterlimit:10;}.cls-2{stroke:#fff;stroke-width:4.72px;}.cls-3{fill:#fff;}.cls-4{stroke:#000;stroke-width:4.58px;}</style>
+ </defs>
+ <title
+ id="title199">PubSolar logo</title>
+ <path
+ class="cls-1"
+ d="M362.85,272.68v11.78l-4.39,1.84a18.38,18.38,0,0,0-11.24,15.8l-.59,9.43-7.92.61a18.38,18.38,0,0,0-15.53,11.22l-2.47,5.9H309.07a18.38,18.38,0,0,0-14.13,6.63l-6.8,8.17-10.58-3.17a18.38,18.38,0,0,0-14.89,1.95l-9.84,6-8.65-5.75a18.38,18.38,0,0,0-15.75-2.2l-10,3.17-5.88-7a18.38,18.38,0,0,0-15.43-6.51l-10.24.76-4.62-8.75a18.38,18.38,0,0,0-14.22-9.69l-9.7-1.08-1.89-10.65a18.38,18.38,0,0,0-11.06-13.77L134.7,283l.93-11.32a18.38,18.38,0,0,0-7-16l-6.52-5.06,3.55-8.77a18.38,18.38,0,0,0-1.77-17.13l-5.74-8.57,6.06-8a18.38,18.38,0,0,0,2.54-17.63l-3.93-10.34,5.12-2.87a18.38,18.38,0,0,0,9.31-17.78l-1.12-11.75,8.18-2.64a18.38,18.38,0,0,0,12.67-16l.75-9.5h6.44a18.38,18.38,0,0,0,17.59-13L184,99.13l12.19,1.25a18.38,18.38,0,0,0,17.27-8.25l4.11-6.3,8.21,3.79a18.38,18.38,0,0,0,20.12-3.14l5.85-5.36L261,88.21a18.38,18.38,0,0,0,18.23,2.32L287.76,87l6,7.67a18.38,18.38,0,0,0,15.32,7l11.25-.51,3.21,7.56a18.38,18.38,0,0,0,15.29,11.12l9.33.83.48,7.39A18.38,18.38,0,0,0,358.1,143l9.37,5.18-.71,11.41a18.38,18.38,0,0,0,7.43,15.93l7.14,5.26-3.79,10.66a18.38,18.38,0,0,0,2,16.27l5.57,8.45-6.46,10.31a18.38,18.38,0,0,0-2.11,14.77l2.66,9.38-9.63,7.93A18.38,18.38,0,0,0,362.85,272.68Z"
+ transform="translate(-113.88 -76.62)"
+ id="path201" />
+ <circle
+ class="cls-2"
+ cx="137.72"
+ cy="138.48"
+ r="117.79"
+ id="circle203" />
+ <path
+ class="cls-3"
+ d="M326.34,141.78A105.72,105.72,0,0,0,181.56,295.61,105.7,105.7,0,1,1,326.34,141.78Z"
+ transform="translate(-113.88 -76.62)"
+ id="path205" />
+ <path
+ class="cls-3"
+ d="m 180.73,231.12 c 0.57,1.71 6.47,20.7 10,30 3.53,9.3 7.59,16.9 12.87,17.74 5.28,0.84 10.64,-7.56 16.9,-7.78 8.76,-0.31 13.68,-1 18.13,-8.12 3.56,-5.67 9.9,1.76 25.87,-7.49 8.71,-5 26.56,-4.08 43.4,-11.91 20.26,-9.42 6.82,-12 6.83,-24 0,-3.84 3.66,-4.88 9.42,-7.17 3.82,-1.52 9.75,-4.8 8.63,-8.92 -1.24,-4.55 -0.79,-6.28 -5.2,-7.93 -8.95912,-3.35701 -15.41112,0.51436 -20.81894,2.56685 -7.90305,3.13369 -9.25397,-5.78637 -14.68734,-7.38637 -3.84252,-1.13153 -10.81538,-2.53029 -12.21968,-9.01195 C 278.1258,173.18465 270.1,170.58 261.8,170.42 c -4.33,-0.08 -8,1.37 -11,-5.82 -3.38,-8.07 -10.07,-19.35 -16.92,-12 -6.85,7.35 2,17.55 3.13,27 0.19,1.55 -0.08,3 -1.63,3.23 -3.79619,0.48553 -7.30604,2.27403 -9.93,5.06 -4.27,4.41 -8.18,-2.59 -15.09,3.8 -6.32,5.85 -13.27,-0.73 -25.52,-0.41 -20.65,0.56 -4.11,39.84 -4.11,39.84 z"
+ transform="translate(-113.88,-76.62)"
+ id="path207"
+ sodipodi:nodetypes="csscccccccccscccscccccc" />
+ <path
+ class="cls-4"
+ d="M200.74,254.41a27,27,0,0,0,1.31,3c2.16,4.33,1.11,2.86,3.11,6.36,1.22,2.13,4.06,6.21,2.11,6.86-1.68.56-4.06-1-4.75-3.08-.34-1-.59-2.08-.93-3.1-2.72-8.19-6.6-15.8-9.33-24-3-9-5.76-18.25-7.12-27.94-.46-3.57-3.28-10.18-.86-11,1.49-.49,2.14.53,2.48,1.55.74,2.23.09,2.45.5,3.66a1.31,1.31,0,0,0,1.7.78c1.68-.56,1.9-3.63,3.95-4.31,7.36-2.45,15.23,5.38,17.4,11.9,1.48,6-1.4,10.39-6.34,15.14a7.39,7.39,0,0,1-2.86,1.67c-2,.68-4.81.46-6.12.89s-1.61,1.36-1.15,2.76,1.21,2.7,1.67,4.1c.68,2,1.15,4.07,1.83,6.11a13.67,13.67,0,0,0,.71,1.83C198.94,249.94,200,252.18,200.74,254.41Zm-6.45-48.32c-6.52,2.17-4.88,13.31-3,19.08,1.3,3.91,4.19,5.44,8.09,4.14,5.59-1.86,9.23-8.65,7.37-14.24C205.11,211,199.22,204.45,194.29,206.09Z"
+ transform="translate(-113.88 -76.62)"
+ id="path209" />
+ <path
+ class="cls-4"
+ d="M216.34,197.41a.88.88,0,0,1,1.35.45c2.1,3.85,3.09,9.07,5.33,13.18,2.1,3.85,7.1,7,9.45,5.68,2.67-1.46,4.77-8.79,2.56-12.83-.64-1.17-1.64-2.24-2.5-3.8-1.32-2.41-2.15-6.11.13-7.35,1.37-.75,1.92-.2,2.31.52.07.13.08.29.15.43.25.46.59.78.84,1.23,1.1,2,1.14,4.88,1.54,6.86a21.85,21.85,0,0,0,2,6.08,14.16,14.16,0,0,0,4.19,4.74c.38.38,1,.73,1.24,1.18a1.24,1.24,0,0,1-.71,1.66c-.85.46-3.88-1.52-4.84-3.28-.21-.39-.3-.85-.55-1.31a.78.78,0,0,0-1.14-.23c-.65.36-.62,2.12-.83,2.82-.76,2-1.51,4.21-3.33,5.21-4,2.21-9.11-1.63-10.89-4.89-.43-.78-.79-1.6-1.25-2.45C219.43,207.58,215.43,197.91,216.34,197.41Z"
+ transform="translate(-113.88 -76.62)"
+ id="path211" />
+ <path
+ class="cls-4"
+ d="M251.1,184.25c.22.55.06,1.41,1.17,1,.62-.24.83-1.12,1.06-1.77a7.57,7.57,0,0,1,4.54-4.5c6.36-2.5,13.65,1.82,15.88,7.49,2.12,5.39,1,13.9-5.72,16.54a10.23,10.23,0,0,1-5.58.43,4,4,0,0,0-2-.18c-.9.35,0,2.33-1.08,2.74-1.94.76-3.25-.83-4.09-2.74-1.37-3.29-3.11-8.25-4.44-11.64s-2.43-7.19-3.84-10.79c-1.33-3.39-3-6.71-4.39-10.17-.6-1.52-1.13-3.07-1.7-4.52a17.75,17.75,0,0,0-2.25-4.31,1,1,0,0,1-.23-.39,1.46,1.46,0,0,1,1.06-1.77,1.54,1.54,0,0,1,2.14,1l.14.35a75.7,75.7,0,0,0,3.53,10.19c.35.9.8,1.84,1.15,2.74l-.07,0C247.73,177.34,249.77,180.86,251.1,184.25Zm8-3.06c-5.33,2.09-6.44,8.2-4.32,13.59a9.89,9.89,0,0,0,13,5.9c4.36-1.71,5.62-9.07,3.88-13.5C268.24,181.58,263.7,179.37,259.07,181.19Z"
+ transform="translate(-113.88 -76.62)"
+ id="path213" />
+ <path
+ class="cls-4"
+ d="M216.42,242.8c-.49-2.48,2.88-6.17,6.16-6.81,1.83-.36,4.94.47,5.28,2.22a1.91,1.91,0,0,1-1.12,2c-1.38.27-2.88-1.93-4.33-1.65s-3.39,2.41-3.13,3.72c.59,3,7.19,5.79,10.06,8.48a7,7,0,0,1,2.07,3.61,7.5,7.5,0,0,1-5.63,8.37c-5.76,1.13-9.07-3-11.63-6.81a2,2,0,0,1-.39-.83,1.4,1.4,0,0,1,1-1.71c.87-.17,1.43.7,1.86,1.38,1.5,3,4,6.41,8.28,5.57,2.7-.53,4.44-3.22,3.79-6.57C227.21,249.93,217.23,247,216.42,242.8Z"
+ transform="translate(-113.88 -76.62)"
+ id="path215" />
+ <path
+ class="cls-4"
+ d="M244.38,250.12c-6.18-5.9-6.33-14.67-2.63-18.54,2.46-2.58,9.1-4.36,13.13-.51,3.39,3.23,6.36,13.57,1.38,18.78a6.15,6.15,0,0,1-5.21,1.91,7.1,7.1,0,0,0-3.3.34c-.83.33-1,.34-1.85-.43-.27-.26-.59-.67-1.08-1.13Zm8.85-17.44a6.87,6.87,0,0,0-9.3.16c-2.62,2.74-1.09,12.22,1.38,14.58s7.16,2.94,9.68.3C258,244.55,257.58,236.83,253.23,232.67Z"
+ transform="translate(-113.88 -76.62)"
+ id="path217" />
+ <path
+ class="cls-4"
+ d="M269.24,237.75a63.21,63.21,0,0,0-2.83-6.39s-1-2.71-1.6-4.88c-.76-1.94-1.59-3.84-2.35-5.78-2.09-5.33-10.17-21.45-6.49-20.18,1.83.63,2.79.82,3.06,1.52a28.65,28.65,0,0,1,1,4.84c1.23,4.66,4.57,13.94,6.83,19.68.9,2.28,1.89,4.61,2.93,6.83,2,4.46,4.33,9.33,4.18,10.25C273.94,243.64,272.62,248.25,269.24,237.75Z"
+ transform="translate(-113.88 -76.62)"
+ id="path219" />
+ <path
+ class="cls-4"
+ d="M288.05,226.57c1-.37,1.51-1,1.29-2.58-.3-2.13-2.48-6.48-4.62-6.18-1.84.26-3.45,3.78-4.85,4-.59.08-1.23-.73-1.29-1.17-.26-1.84,4.38-4.66,5.92-4.88,5.22-.73,7.52,9.3,9.65,15.91.44,1.52,1,2.41,2.74,2.39.68.06,1.72,0,1.83.72A2.08,2.08,0,0,1,297,237c-1.25.17-2.61-1.51-3.64-1.37-2.06.29-3.5,3.94-6.3,4.33a4.31,4.31,0,0,1-4.94-3.66c0-.22,0-.45,0-.67C281.56,230.56,283.06,228.39,288.05,226.57ZM284.42,235c.21,1.47.62,2.84,2.54,2.57s5.26-4.26,5-6.32c-.33-2.36-2.1-2.71-3.91-2.76C285.44,228.81,284,231.64,284.42,235Z"
+ transform="translate(-113.88 -76.62)"
+ id="path221" />
+ <path
+ class="cls-4"
+ d="M306.07,208c2.38-.87,14.61-5.28,16.95-6.05.86-.23,1.94-.52,2.28.78.92,3.45-22.71,6-20.38,14.81,1.28,4.81,2.85,9.55,4,14.3.25.93.1,1.82-1,2.11-2.08.56-4.25-10.17-4.27-10.24C301.92,216.9,299.43,210.42,306.07,208Z"
+ transform="translate(-113.88 -76.62)"
+ id="path223" />
+ <ellipse
+ style="fill:#000000;fill-rule:evenodd;stroke-width:0.83809"
+ id="path429"
+ cx="172.17104"
+ cy="122.1034"
+ rx="4.5852861"
+ ry="4.9624691" />
+ <metadata
+ id="metadata3053">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:title>PubSolar logo</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/modules/nextcloud/nextcloud-skeleton/Readme.md b/overlays/pkgs/nextcloud-skeleton/default/Readme.md
similarity index 58%
rename from modules/nextcloud/nextcloud-skeleton/Readme.md
rename to overlays/pkgs/nextcloud-skeleton/default/Readme.md
index 233693f..15eb5fe 100644
--- a/modules/nextcloud/nextcloud-skeleton/Readme.md
+++ b/overlays/pkgs/nextcloud-skeleton/default/Readme.md
@@ -2,6 +2,6 @@
By default, the cloud is limited to 10MB of storage. If you want more, just send a short request to [crew@pub.solar](mailto:crew@pub.solar).
-To download a desktop client, go to https://nextcloud.com/download.
+To download a Nextlcoud desktop client, go to https://nextcloud.com/download. You can find instructions on how to set it up on our [Nextcloud wiki page](https://wiki.pub.solar/index.php/Nextcloud).
You can edit this file by clicking here, and put any contents you want as notes for this directory :)
diff --git a/tests/keycloak.nix b/tests/keycloak.nix
index 0d4a825..df8a2d7 100644
--- a/tests/keycloak.nix
+++ b/tests/keycloak.nix
@@ -78,7 +78,7 @@ in
''
start_all()
- nachtigall.wait_for_unit("system.slice")
+ nachtigall.wait_for_unit("default.target")
nachtigall.succeed("ping 127.0.0.1 -c 2")
nachtigall.wait_for_unit("nginx.service")
nachtigall.wait_for_unit("keycloak.service")
@@ -87,7 +87,7 @@ in
nachtigall.wait_until_succeeds("curl http://127.0.0.1:8080/")
nachtigall.wait_until_succeeds("curl https://auth.test.pub.solar/")
- client.wait_for_unit("system.slice")
+ client.wait_for_unit("default.target")
client.sleep(30)
# client.wait_until_succeeds("${wmClass} | grep -q 'firefox'")
client.screenshot("screen")
diff --git a/tests/website.nix b/tests/website.nix
index 39443f9..7939f68 100644
--- a/tests/website.nix
+++ b/tests/website.nix
@@ -46,15 +46,16 @@
testScript = ''
start_all()
- acme_server.wait_for_unit("system.slice")
+ acme_server.wait_for_unit("default.target")
acme_server.wait_for_unit("step-ca.service")
acme_server.succeed("ping ca.test.pub.solar -c 2")
acme_server.wait_for_open_port(443)
acme_server.wait_until_succeeds("curl 127.0.0.1:443")
- nachtigall.wait_for_unit("system.slice")
+ nachtigall.wait_for_unit("default.target")
nachtigall.succeed("ping test.pub.solar -c 2")
nachtigall.succeed("ping ca.test.pub.solar -c 2")
+ nachtigall.wait_for_unit("acme-test.pub.solar.service")
nachtigall.wait_for_unit("nginx.service")
nachtigall.wait_for_open_port(443, "test.pub.solar")
nachtigall.wait_until_succeeds("curl https://test.pub.solar/")