MAAS

Merge ~troyanov/maas:backport-2c575e5-3.5 into maas:3.5

  1. Git
  2. lp:~troyanov/maas
  3. backport-2c575e5-3.5
  4. Merge into 3.5
Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: 401bd65b684a80eb90a58e635364e8155c418eae
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:backport-2c575e5-3.5
Merge into: maas:3.5
Diff against target: 13 lines (+1/-1)
1 file modified
src/provisioningserver/rackdservices/http.py (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Anton Troyanov Approve
Review via email: mp+463778@code.launchpad.net

Commit message

fix: nginx rackd.conf httpproxy socket location

Resolves LP:2060288

(cherry picked from commit 2c575e55a3f007c37c38f0d2933921783804f642)

To post a comment you must log in.
Revision history for this message
Anton Troyanov (troyanov) wrote :

Self approve backport

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b backport-2c575e5-3.5 lp:~troyanov/maas/+git/maas into -b 3.5 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 401bd65b684a80eb90a58e635364e8155c418eae

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/rackdservices/http.py b/src/provisioningserver/rackdservices/http.py
2index 39d5b28..71eb68c 100644
3--- a/src/provisioningserver/rackdservices/http.py
4+++ b/src/provisioningserver/rackdservices/http.py
5@@ -177,7 +177,7 @@ class RackHTTPService(TimerService):
6 root_prefix = get_root_path()
7 httpproxy_socket_path = os.getenv(
8 "MAAS_AGENT_HTTPPROXY_SOCKET_PATH",
9- str(get_maas_run_path() / "agent" / "httpproxy.sock"),
10+ str(get_maas_run_path() / "httpproxy.sock"),
11 )
12 try:
13 rendered = template.substitute(

Subscribers

People subscribed via source and target branches