Skip to content

Commit 2720da7

Browse files
jajikjajik
committed
test: Update conf files before moving to docker custom network with DNS
1 parent ba2b865 commit 2720da7

File tree

13 files changed

+231
-291
lines changed

13 files changed

+231
-291
lines changed

‎test/MODCLUSTER-640/mod_lbmethod_cluster.conf‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,31 @@ LoadModule lbmethod_cluster_module modules/mod_lbmethod_cluster.so
99
LoadModule watchdog_module modules/mod_watchdog.so
1010

1111
LogLevel info
12-
ServerName localhost
12+
ServerName httpd-mod_proxy_cluster
1313
ProxyPreserveHost On
1414
UseNocanon On
1515

16-
<IfModule manager_module>
17-
Listen 8090
18-
ManagerBalancerName mycluster
16+
Listen 8090
17+
ManagerBalancerName mycluster
1918

20-
EnableWsTunnel
21-
WSUpgradeHeader websocket
22-
<VirtualHost *:8090>
23-
EnableMCMPReceive
24-
<Location />
25-
Require ip 127.0.0.1
26-
Require ip ::1
27-
# This one is used in GH Actions
28-
Require ip 172.17.
29-
</Location>
30-
<Location /mod_cluster_manager>
31-
SetHandler mod_cluster-manager
32-
Require ip 127.0.0.1
33-
Require ip ::1
34-
# This one is used in GH Actions
35-
Require ip 172.17.
36-
</Location>
37-
</VirtualHost>
38-
</IfModule>
19+
EnableWsTunnel
20+
WSUpgradeHeader websocket
21+
22+
<VirtualHost *:8090>
23+
EnableMCMPReceive
24+
<Location />
25+
Require host .mod_proxy_cluster_testsuite_net
26+
# _gateway is the hostname used through the docker port forward into the custom network
27+
Require host _gateway
28+
Require local
29+
</Location>
30+
<Location /mod_cluster_manager>
31+
SetHandler mod_cluster-manager
32+
# _gateway is the hostname used through the docker port forward into the custom network
33+
Require host _gateway
34+
Require local
35+
</Location>
36+
</VirtualHost>
3937

4038
<Proxy "balancer://mycluster">
4139
ProxySet growth=10

‎test/MODCLUSTER-640/mod_proxy_cluster.conf‎

Lines changed: 23 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,33 @@ LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
66
LoadModule manager_module modules/mod_manager.so
77
LoadModule proxy_cluster_module modules/mod_proxy_cluster.so
88

9-
LogLevel info
109
UseNocanon On
11-
ServerName localhost
10+
ServerName httpd-mod_proxy_cluster
1211
ProxyPreserveHost On
1312

13+
Listen 8090
14+
ManagerBalancerName mycluster
15+
WSUpgradeHeader websocket
16+
EnableWsTunnel
1417

15-
<IfModule !lbmethod_cluster_module>
16-
UseAlias On
17-
</IfModule>
18+
CreateBalancers 0
19+
EnableOptions On
1820

19-
<IfModule manager_module>
20-
Listen 8090
21-
ManagerBalancerName mycluster
21+
<VirtualHost *:8090>
22+
EnableMCMPReceive
23+
<Location />
24+
Require host .mod_proxy_cluster_testsuite_net
25+
# _gateway is the hostname used through the docker port forward into the custom network
26+
Require host _gateway
27+
Require local
28+
</Location>
2229

23-
<IfModule !lbmethod_cluster_module>
24-
CreateBalancers 0
25-
EnableOptions On
26-
</IfModule>
30+
<Location /mod_cluster_manager>
31+
SetHandler mod_cluster-manager
32+
# _gateway is the hostname used through the docker port forward into the custom network
33+
Require host _gateway
34+
Require local
35+
</Location>
36+
</VirtualHost>
2737

28-
EnableWsTunnel
29-
WSUpgradeHeader websocket
30-
<VirtualHost *:8090>
31-
EnableMCMPReceive
32-
<Location />
33-
Require ip 127.0.0.1
34-
Require ip ::1
35-
# This one is used in GH Actions
36-
Require ip 172.17.
37-
</Location>
38-
<Location /mod_cluster_manager>
39-
SetHandler mod_cluster-manager
40-
Require ip 127.0.0.1
41-
Require ip ::1
42-
# This one is used in GH Actions
43-
Require ip 172.17.
44-
</Location>
45-
</VirtualHost>
46-
</IfModule>
47-
48-
<IfModule lbmethod_cluster_module>
49-
<Proxy "balancer://mycluster">
50-
ProxySet growth=10
51-
ProxySet lbmethod=cluster
52-
</Proxy>
53-
</IfModule>
38+
LogLevel info

‎test/MODCLUSTER-734/mod_lbmethod_cluster.conf‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ LoadModule watchdog_module modules/mod_watchdog.so
1111
ProxyHCExpr in_maint {hc('body') !~ /Under maintenance/}
1212
ModProxyClusterHCTemplate hcmethod=GET hcexpr=in_maint hcuri=/status.jsp
1313

14-
Maxnode 505
15-
Maxhost 1010
16-
Maxcontext 1100
1714
Listen 8090
1815
ManagerBalancerName mycluster
19-
ServerName localhost
16+
ServerName httpd-mod_proxy_cluster
2017

2118
<VirtualHost *:8090>
22-
EnableMCMPReceive
23-
<Location />
24-
Require ip 127.0.0.
25-
Require ip ::1
26-
# This one is used in GH Actions
27-
Require ip 172.17.
28-
</Location>
29-
<Location /mod_cluster_manager>
30-
SetHandler mod_cluster-manager
31-
Require ip 127.0.0.
32-
Require ip ::1
33-
# This one is used in GH Actions
34-
Require ip 172.17.
35-
</Location>
19+
EnableMCMPReceive
20+
<Location />
21+
Require host .mod_proxy_cluster_testsuite_net
22+
# _gateway is the hostname used through the docker port forward into the custom network
23+
Require host _gateway
24+
Require local
25+
</Location>
26+
<Location /mod_cluster_manager>
27+
SetHandler mod_cluster-manager
28+
# _gateway is the hostname used through the docker port forward into the custom network
29+
Require host _gateway
30+
Require local
31+
</Location>
3632
</VirtualHost>
3733

3834
<Proxy "balancer://mycluster">
39-
ProxySet growth=20
40-
ProxySet lbmethod=cluster
35+
ProxySet growth=20
36+
ProxySet lbmethod=cluster
4137
</Proxy>
38+
39+
Maxnode 505
40+
Maxhost 1010
41+
Maxcontext 1100

‎test/MODCLUSTER-734/mod_proxy_cluster.conf‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
88
ProxyHCExpr in_maint {hc('body') !~ /Under maintenance/}
99
ModProxyClusterHCTemplate hcmethod=GET hcexpr=in_maint hcuri=/status.jsp
1010

11-
Maxnode 505
12-
Maxhost 1010
13-
Maxcontext 1100
1411
Listen 8090
1512
ManagerBalancerName mycluster
16-
ServerName localhost
13+
ServerName httpd-mod_proxy_cluster
1714

1815
<VirtualHost *:8090>
19-
EnableMCMPReceive
20-
<Location />
21-
Require ip 127.0.0.1
22-
Require ip ::1
23-
# This one is used in GH Actions
24-
Require ip 172.17.
25-
</Location>
26-
<Location /mod_cluster_manager>
27-
SetHandler mod_cluster-manager
28-
Require ip 127.0.0.1
29-
Require ip ::1
30-
# This one is used in GH Actions
31-
Require ip 172.17.
32-
</Location>
16+
EnableMCMPReceive
17+
<Location />
18+
Require host .mod_proxy_cluster_testsuite_net
19+
# _gateway is the hostname used through the docker port forward into the custom network
20+
Require host _gateway
21+
Require local
22+
</Location>
23+
<Location /mod_cluster_manager>
24+
SetHandler mod_cluster-manager
25+
# _gateway is the hostname used through the docker port forward into the custom network
26+
Require host _gateway
27+
Require local
28+
</Location>
3329
</VirtualHost>
30+
31+
Maxnode 505
32+
Maxhost 1010
33+
Maxcontext 1100

‎test/MODCLUSTER-755/mod_lbmethod_cluster.conf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@ Maxhost 1010
1313
Maxcontext 1100
1414
Listen 8090
1515
ManagerBalancerName mycluster
16-
ServerName localhost
16+
ServerName httpd-mod_proxy_cluster
1717

1818
<VirtualHost *:8090>
19-
EnableMCMPReceive
20-
<Location />
21-
Require ip 127.0.0.1
22-
Require ip ::1
23-
# This one is used in GH Actions
24-
Require ip 172.17.
25-
</Location>
26-
<Location /mod_cluster_manager>
27-
SetHandler mod_cluster-manager
28-
Require ip 127.0.0.1
29-
Require ip ::1
30-
# This one is used in GH Actions
31-
Require ip 172.17.
32-
</Location>
19+
EnableMCMPReceive
20+
<Location />
21+
Require host .mod_proxy_cluster_testsuite_net
22+
# _gateway is the hostname used through the docker port forward into the custom network
23+
Require host _gateway
24+
Require local
25+
</Location>
26+
<Location /mod_cluster_manager>
27+
SetHandler mod_cluster-manager
28+
# _gateway is the hostname used through the docker port forward into the custom network
29+
Require host _gateway
30+
Require local
31+
</Location>
3332
</VirtualHost>
3433

3534
<Proxy "balancer://mycluster">

‎test/MODCLUSTER-755/mod_proxy_cluster.conf‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@ LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
55
LoadModule watchdog_module modules/mod_watchdog.so
66
LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
77

8-
Maxnode 505
9-
Maxhost 1010
10-
Maxcontext 1100
118
Listen 8090
129
ManagerBalancerName mycluster
13-
ServerName localhost
10+
ServerName httpd-mod_proxy_cluster
1411

1512
<VirtualHost *:8090>
1613
EnableMCMPReceive
17-
<Location />
18-
Require ip 127.0.0.1
19-
Require ip ::1
20-
# This one is used in GH Actions
21-
Require ip 172.17.
22-
</Location>
23-
<Location /mod_cluster_manager>
24-
SetHandler mod_cluster-manager
25-
Require ip 127.0.0.1
26-
Require ip ::1
27-
# This one is used in GH Actions
28-
Require ip 172.17.
29-
</Location>
14+
<Location />
15+
Require host .mod_proxy_cluster_testsuite_net
16+
# _gateway is the hostname used through the docker port forward into the custom network
17+
Require host _gateway
18+
Require local
19+
</Location>
20+
<Location /mod_cluster_manager>
21+
SetHandler mod_cluster-manager
22+
# _gateway is the hostname used through the docker port forward into the custom network
23+
Require host _gateway
24+
Require local
25+
</Location>
3026
</VirtualHost>
27+
28+
Maxnode 505
29+
Maxhost 1010
30+
Maxcontext 1100

‎test/MODCLUSTER-785/mod_lbmethod_cluster.conf‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,34 @@ LoadModule manager_module modules/mod_manager.so
88
LoadModule lbmethod_cluster_module modules/mod_lbmethod_cluster.so
99
LoadModule watchdog_module modules/mod_watchdog.so
1010

11-
Maxnode 505
12-
Maxhost 1010
13-
Maxcontext 1100
1411
Listen 8090
1512
ManagerBalancerName mycluster
16-
ServerName localhost
13+
ServerName httpd-mod_proxy_cluster
1714

1815
EnableWsTunnel
1916
WSUpgradeHeader websocket
2017

2118
<VirtualHost *:8090>
22-
EnableMCMPReceive
23-
<Location />
24-
Require ip 127.0.0.1
25-
Require ip ::1
26-
# This one is used in GH Actions
27-
Require ip 172.17.
28-
</Location>
29-
<Location /mod_cluster_manager>
30-
SetHandler mod_cluster-manager
31-
Require ip 127.0.0.1
32-
Require ip ::1
33-
# This one is used in GH Actions
34-
Require ip 172.17.
35-
</Location>
19+
EnableMCMPReceive
20+
<Location />
21+
Require host .mod_proxy_cluster_testsuite_net
22+
# _gateway is the hostname used through the docker port forward into the custom network
23+
Require host _gateway
24+
Require local
25+
</Location>
26+
<Location /mod_cluster_manager>
27+
SetHandler mod_cluster-manager
28+
# _gateway is the hostname used through the docker port forward into the custom network
29+
Require host _gateway
30+
Require local
31+
</Location>
3632
</VirtualHost>
3733

3834
<Proxy "balancer://mycluster">
3935
ProxySet growth=10
4036
ProxySet lbmethod=cluster
4137
</Proxy>
38+
39+
Maxnode 505
40+
Maxhost 1010
41+
Maxcontext 1100

0 commit comments

Comments
 (0)