Skip to content

Fix/portal preview cloud #8838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fdurand wants to merge 3 commits into
base: devel
Choose a base branch
from
+8 −6
Open

Fix/portal preview cloud #8838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41283ff
Use env variable
fdurand Nov 19, 2025
d64d8b3
Missing comma
fdurand Nov 21, 2025
685c535
Don't use pf-apache-wrapper
jrouzierinverse Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conf/pf.conf.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,7 @@ sender=monit@$HOST
httpd_portal=[% ENV.env_or_default("PF_SERVICES_URL_HTTPD_PORTAL", "http://containers-gateway.internal:8080") %]
httpd_dispatcher=[% ENV.env_or_default("PF_SERVICES_URL_HTTPD_DISPATCHER", "http://containers-gateway.internal:8888") %]
httpd_dispatcher_static=[% ENV.env_or_default("PF_SERVICES_URL_HTTPD_DISPATCHER_STATIC", "http://containers-gateway.internal:8889") %]
httpd_admin_dispatcher=[% ENV.env_or_default("PF_SERVICES_URL_HTTPD_ADMIN_DISPATCHER", "http://containers-gateway.internal:8890") %]
httpd_admin_dispatcher_static=[% ENV.env_or_default("PF_SERVICES_URL_HTTPD_ADMIN_DISPATCHER_STATIC", "http://containers-gateway.internal:8891") %]
pfpki=[% ENV.env_or_default("PF_SERVICES_URL_PFPKI", "http://containers-gateway.internal:22225") %]
pfipset=[% ENV.env_or_default("PF_SERVICES_URL_PFIPSET", "http://containers-gateway.internal:22223") %]
Expand Down
5 changes: 1 addition & 4 deletions containers/httpd.webservices/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,4 @@ COPY lib lib
copy html html
RUN chown -R pf: /usr/local/pf/html

COPY containers/pf-apache-wrapper containers/pf-apache-wrapper
RUN chmod +x containers/pf-apache-wrapper

ENTRYPOINT /usr/local/pf/containers/pf-apache-wrapper /usr/sbin/apache2 -f /usr/local/pf/var/conf/httpd.conf.d/httpd.webservices -DFOREGROUND
ENTRYPOINT /usr/sbin/apache2 -f /usr/local/pf/var/conf/httpd.conf.d/httpd.webservices -DFOREGROUND
8 changes: 6 additions & 2 deletions lib/pf/services/manager/haproxy_admin.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ sub generateConfig {
my $api_frontend_service_host = $api_frontend_service_uri->host;
my $api_frontend_service_port = $api_frontend_service_uri->port;

my $httpd_admin_dispatcher_uri = URI->new($Config{services_url}{'httpd_admin_dispatcher'});
my $httpd_admin_dispatcher_host = $httpd_admin_dispatcher_uri->host;
my $httpd_admin_dispatcher_port = $httpd_admin_dispatcher_uri->port;

my $mgmt_cluster_ip;
if ( $management_network && defined($management_network->{'Tip'}) && $management_network->{'Tip'} ne '') {
my $mgmt_int = $management_network->tag('int');
Expand Down Expand Up @@ -225,8 +229,8 @@ backend $mgmt_cluster_ip-portal
http-request lua.admin
http-request set-header Host $portal_preview_ip
http-request add-header X-Forwarded-For-Packetfence 127.0.0.1
http-request set-dst-port int(8890)
server service 100.64.0.1:0
http-request set-dst-port int($httpd_admin_dispatcher_port)
server service $httpd_admin_dispatcher_host:0
http-request set-uri %[var(req.path)]?%[query] if paramsquery
http-request set-uri %[var(req.path)] unless paramsquery

Expand Down