pyrox.dev
discourse.tests: nodes.discourse.config -> nodes.discourse
+4
-4
nixos/tests/discourse.nix
+4
-4
nixos/tests/discourse.nix
···
40
40
41
41
networking.extraHosts = ''
42
42
127.0.0.1 ${discourseDomain}
43
-
${nodes.client.config.networking.primaryIPAddress} ${clientDomain}
43
+
${nodes.client.networking.primaryIPAddress} ${clientDomain}
44
44
'';
45
45
46
46
services.postfix = {
···
90
90
91
91
networking.extraHosts = ''
92
92
127.0.0.1 ${clientDomain}
93
-
${nodes.discourse.config.networking.primaryIPAddress} ${discourseDomain}
93
+
${nodes.discourse.networking.primaryIPAddress} ${discourseDomain}
94
94
'';
95
95
96
96
services.dovecot2 = {
···
178
178
discourse.wait_until_succeeds("curl -sS -f https://${discourseDomain}")
179
179
discourse.succeed(
180
180
"curl -sS -f https://${discourseDomain}/session/csrf -c cookie -b cookie -H 'Accept: application/json' | jq -r '\"X-CSRF-Token: \" + .csrf' > csrf_token",
181
-
"curl -sS -f https://${discourseDomain}/session -c cookie -b cookie -H @csrf_token -H 'Accept: application/json' -d 'login=${nodes.discourse.config.services.discourse.admin.username}' -d \"password=${adminPassword}\" | jq -e '.user.username == \"${nodes.discourse.config.services.discourse.admin.username}\"'",
182
-
"curl -sS -f https://${discourseDomain}/login -v -H 'Accept: application/json' -c cookie -b cookie 2>&1 | grep ${nodes.discourse.config.services.discourse.admin.username}",
181
+
"curl -sS -f https://${discourseDomain}/session -c cookie -b cookie -H @csrf_token -H 'Accept: application/json' -d 'login=${nodes.discourse.services.discourse.admin.username}' -d \"password=${adminPassword}\" | jq -e '.user.username == \"${nodes.discourse.services.discourse.admin.username}\"'",
182
+
"curl -sS -f https://${discourseDomain}/login -v -H 'Accept: application/json' -c cookie -b cookie 2>&1 | grep ${nodes.discourse.services.discourse.admin.username}",
183
183
)
184
184
185
185
client.wait_for_unit("postfix.service")