Skip to content

Commit 7b8c9b0

Browse files
barryobarryo
committed
Revert "Merge branch 'master' into release-v7"
This reverts commit cdf3f4e, reversing changes made to 7c1d52d.
1 parent cdf3f4e commit 7b8c9b0

8 files changed

+226
-226
lines changed

‎config/ixp_fe_settings.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -794,25 +794,25 @@
794794
'help' => 'Full path to the bgpq3 utility.',
795795
],
796796

797-
// 'ping4' => [
798-
// 'config_key' => 'ixp.exec.ping4',
799-
// 'dotenv_key' => 'IXP_EXEC_PING4',
800-
// 'type' => 'text',
801-
// 'rules' => '',
802-
// 'name' => 'Diagnostics - ipv4 ping',
803-
// 'docs_url' => null,
804-
// 'help' => 'ping command for ipv4 diagnostics. <code>%s</code> is the placeholder for the target IP.',
805-
// ],
806-
//
807-
// 'ping6' => [
808-
// 'config_key' => 'ixp.exec.ping6',
809-
// 'dotenv_key' => 'IXP_EXEC_PING6',
810-
// 'type' => 'text',
811-
// 'rules' => '',
812-
// 'name' => 'Diagnostics - ipv6 ping',
813-
// 'docs_url' => null,
814-
// 'help' => 'ping command for ipv6 diagnostics. <code>%s</code> is the placeholder for the target IP.',
815-
// ],
797+
'ping4' => [
798+
'config_key' => 'ixp.exec.ping4',
799+
'dotenv_key' => 'IXP_EXEC_PING4',
800+
'type' => 'text',
801+
'rules' => '',
802+
'name' => 'Diagnostics - ipv4 ping',
803+
'docs_url' => null,
804+
'help' => 'ping command for ipv4 diagnostics. <code>%s</code> is the placeholder for the target IP.',
805+
],
806+
807+
'ping6' => [
808+
'config_key' => 'ixp.exec.ping6',
809+
'dotenv_key' => 'IXP_EXEC_PING6',
810+
'type' => 'text',
811+
'rules' => '',
812+
'name' => 'Diagnostics - ipv6 ping',
813+
'docs_url' => null,
814+
'help' => 'ping command for ipv6 diagnostics. <code>%s</code> is the placeholder for the target IP.',
815+
],
816816

817817

818818
],

‎data/ci/known-good/api-v4-member-export-0.6-auth.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"version": "0.6",
33
"generator": "IXP Manager v999.9.9",
4-
"timestamp": "2025-08-18T18:27:39Z",
4+
"timestamp": "2021-09-20T09:14:25Z",
55
"ixp_list": [
66
{
77
"shortname": "Infrastructure #1",
8-
"name": "IXP",
9-
"country": "IE",
10-
"url": "https:\/\/www.example.com\/",
8+
"name": "*** CONFIG IDENTITY IN .env ***",
9+
"country": "*** CONFIG IDENTITY IN .env ***",
10+
"url": "*** CONFIG IDENTITY IN .env ***",
1111
"peeringdb_id": 48,
1212
"ixf_id": 20,
1313
"ixp_id": 1,
14-
"support_email": "ixp@example.com",
15-
"support_phone": "+353 20 912 2000",
16-
"support_contact_hours": "24x7",
17-
"emergency_email": "ixp@example.com",
18-
"emergency_phone": "+353 20 912 2000",
19-
"emergency_contact_hours": "24x7",
20-
"billing_contact_hours": "8x5",
21-
"billing_email": "ixp@example.com",
22-
"billing_phone": "+353 20 912 2000",
14+
"support_email": "*** CONFIG IDENTITY IN .env ***",
15+
"support_phone": "*** CONFIG IDENTITY IN .env ***",
16+
"support_contact_hours": "*** CONFIG IDENTITY IN .env ***",
17+
"emergency_email": "*** CONFIG IDENTITY IN .env ***",
18+
"emergency_phone": "*** CONFIG IDENTITY IN .env ***",
19+
"emergency_contact_hours": "*** CONFIG IDENTITY IN .env ***",
20+
"billing_contact_hours": "*** CONFIG IDENTITY IN .env ***",
21+
"billing_email": "*** CONFIG IDENTITY IN .env ***",
22+
"billing_phone": "*** CONFIG IDENTITY IN .env ***",
2323
"peering_policy_list": [
2424
"open",
2525
"selective",
@@ -45,28 +45,28 @@
4545
"id": 1,
4646
"name": "switch1",
4747
"colo": "Location 1",
48-
"city": "Cork",
49-
"country": "IE"
48+
"city": "*** CONFIG IDENTITY IN .env ***",
49+
"country": "*** CONFIG IDENTITY IN .env ***"
5050
}
5151
]
5252
},
5353
{
5454
"shortname": "Infrastructure #2",
55-
"name": "IXP",
56-
"country": "IE",
57-
"url": "https:\/\/www.example.com\/",
55+
"name": "*** CONFIG IDENTITY IN .env ***",
56+
"country": "*** CONFIG IDENTITY IN .env ***",
57+
"url": "*** CONFIG IDENTITY IN .env ***",
5858
"peeringdb_id": 387,
5959
"ixf_id": 645,
6060
"ixp_id": 2,
61-
"support_email": "ixp@example.com",
62-
"support_phone": "+353 20 912 2000",
63-
"support_contact_hours": "24x7",
64-
"emergency_email": "ixp@example.com",
65-
"emergency_phone": "+353 20 912 2000",
66-
"emergency_contact_hours": "24x7",
67-
"billing_contact_hours": "8x5",
68-
"billing_email": "ixp@example.com",
69-
"billing_phone": "+353 20 912 2000",
61+
"support_email": "*** CONFIG IDENTITY IN .env ***",
62+
"support_phone": "*** CONFIG IDENTITY IN .env ***",
63+
"support_contact_hours": "*** CONFIG IDENTITY IN .env ***",
64+
"emergency_email": "*** CONFIG IDENTITY IN .env ***",
65+
"emergency_phone": "*** CONFIG IDENTITY IN .env ***",
66+
"emergency_contact_hours": "*** CONFIG IDENTITY IN .env ***",
67+
"billing_contact_hours": "*** CONFIG IDENTITY IN .env ***",
68+
"billing_email": "*** CONFIG IDENTITY IN .env ***",
69+
"billing_phone": "*** CONFIG IDENTITY IN .env ***",
7070
"peering_policy_list": [
7171
"open",
7272
"selective",
@@ -92,8 +92,8 @@
9292
"id": 2,
9393
"name": "switch2",
9494
"colo": "Location 1",
95-
"city": "Cork",
96-
"country": "IE"
95+
"city": "*** CONFIG IDENTITY IN .env ***",
96+
"country": "*** CONFIG IDENTITY IN .env ***"
9797
}
9898
]
9999
}

‎data/ci/known-good/api-v4-member-export-0.6-unauth.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"version": "0.6",
33
"generator": "IXP Manager v999.9.9",
4-
"timestamp": "2025-08-18T18:27:03Z",
4+
"timestamp": "2021-09-20T09:13:50Z",
55
"ixp_list": [
66
{
77
"shortname": "Infrastructure #1",
8-
"name": "IXP",
9-
"country": "IE",
10-
"url": "https:\/\/www.example.com\/",
8+
"name": "*** CONFIG IDENTITY IN .env ***",
9+
"country": "*** CONFIG IDENTITY IN .env ***",
10+
"url": "*** CONFIG IDENTITY IN .env ***",
1111
"peeringdb_id": 48,
1212
"ixf_id": 20,
1313
"ixp_id": 1,
14-
"support_email": "ixp@example.com",
15-
"support_phone": "+353 20 912 2000",
16-
"support_contact_hours": "24x7",
17-
"emergency_email": "ixp@example.com",
18-
"emergency_phone": "+353 20 912 2000",
19-
"emergency_contact_hours": "24x7",
20-
"billing_contact_hours": "8x5",
21-
"billing_email": "ixp@example.com",
22-
"billing_phone": "+353 20 912 2000",
14+
"support_email": "*** CONFIG IDENTITY IN .env ***",
15+
"support_phone": "*** CONFIG IDENTITY IN .env ***",
16+
"support_contact_hours": "*** CONFIG IDENTITY IN .env ***",
17+
"emergency_email": "*** CONFIG IDENTITY IN .env ***",
18+
"emergency_phone": "*** CONFIG IDENTITY IN .env ***",
19+
"emergency_contact_hours": "*** CONFIG IDENTITY IN .env ***",
20+
"billing_contact_hours": "*** CONFIG IDENTITY IN .env ***",
21+
"billing_email": "*** CONFIG IDENTITY IN .env ***",
22+
"billing_phone": "*** CONFIG IDENTITY IN .env ***",
2323
"peering_policy_list": [
2424
"open",
2525
"selective",
@@ -45,28 +45,28 @@
4545
"id": 1,
4646
"name": "switch1",
4747
"colo": "Location 1",
48-
"city": "Cork",
49-
"country": "IE"
48+
"city": "*** CONFIG IDENTITY IN .env ***",
49+
"country": "*** CONFIG IDENTITY IN .env ***"
5050
}
5151
]
5252
},
5353
{
5454
"shortname": "Infrastructure #2",
55-
"name": "IXP",
56-
"country": "IE",
57-
"url": "https:\/\/www.example.com\/",
55+
"name": "*** CONFIG IDENTITY IN .env ***",
56+
"country": "*** CONFIG IDENTITY IN .env ***",
57+
"url": "*** CONFIG IDENTITY IN .env ***",
5858
"peeringdb_id": 387,
5959
"ixf_id": 645,
6060
"ixp_id": 2,
61-
"support_email": "ixp@example.com",
62-
"support_phone": "+353 20 912 2000",
63-
"support_contact_hours": "24x7",
64-
"emergency_email": "ixp@example.com",
65-
"emergency_phone": "+353 20 912 2000",
66-
"emergency_contact_hours": "24x7",
67-
"billing_contact_hours": "8x5",
68-
"billing_email": "ixp@example.com",
69-
"billing_phone": "+353 20 912 2000",
61+
"support_email": "*** CONFIG IDENTITY IN .env ***",
62+
"support_phone": "*** CONFIG IDENTITY IN .env ***",
63+
"support_contact_hours": "*** CONFIG IDENTITY IN .env ***",
64+
"emergency_email": "*** CONFIG IDENTITY IN .env ***",
65+
"emergency_phone": "*** CONFIG IDENTITY IN .env ***",
66+
"emergency_contact_hours": "*** CONFIG IDENTITY IN .env ***",
67+
"billing_contact_hours": "*** CONFIG IDENTITY IN .env ***",
68+
"billing_email": "*** CONFIG IDENTITY IN .env ***",
69+
"billing_phone": "*** CONFIG IDENTITY IN .env ***",
7070
"peering_policy_list": [
7171
"open",
7272
"selective",
@@ -92,8 +92,8 @@
9292
"id": 2,
9393
"name": "switch2",
9494
"colo": "Location 1",
95-
"city": "Cork",
96-
"country": "IE"
95+
"city": "*** CONFIG IDENTITY IN .env ***",
96+
"country": "*** CONFIG IDENTITY IN .env ***"
9797
}
9898
]
9999
}

‎data/ci/known-good/api-v4-member-export-0.7-auth.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"version": "0.7",
33
"generator": "IXP Manager v999.9.9",
4-
"timestamp": "2025-08-18T18:24:08Z",
4+
"timestamp": "2021-09-20T09:12:54Z",
55
"ixp_list": [
66
{
77
"shortname": "Infrastructure #1",
8-
"name": "IXP",
9-
"country": "IE",
10-
"url": "https:\/\/www.example.com\/",
8+
"name": "*** CONFIG IDENTITY IN .env ***",
9+
"country": "*** CONFIG IDENTITY IN .env ***",
10+
"url": "*** CONFIG IDENTITY IN .env ***",
1111
"peeringdb_id": 48,
1212
"ixf_id": 20,
1313
"ixp_id": 1,
14-
"support_email": "ixp@example.com",
15-
"support_phone": "+353 20 912 2000",
16-
"support_contact_hours": "24x7",
17-
"emergency_email": "ixp@example.com",
18-
"emergency_phone": "+353 20 912 2000",
19-
"emergency_contact_hours": "24x7",
20-
"billing_contact_hours": "8x5",
21-
"billing_email": "ixp@example.com",
22-
"billing_phone": "+353 20 912 2000",
14+
"support_email": "*** CONFIG IDENTITY IN .env ***",
15+
"support_phone": "*** CONFIG IDENTITY IN .env ***",
16+
"support_contact_hours": "*** CONFIG IDENTITY IN .env ***",
17+
"emergency_email": "*** CONFIG IDENTITY IN .env ***",
18+
"emergency_phone": "*** CONFIG IDENTITY IN .env ***",
19+
"emergency_contact_hours": "*** CONFIG IDENTITY IN .env ***",
20+
"billing_contact_hours": "*** CONFIG IDENTITY IN .env ***",
21+
"billing_email": "*** CONFIG IDENTITY IN .env ***",
22+
"billing_phone": "*** CONFIG IDENTITY IN .env ***",
2323
"peering_policy_list": [
2424
"open",
2525
"selective",
@@ -45,30 +45,30 @@
4545
"id": 1,
4646
"name": "switch1",
4747
"colo": "Location 1",
48-
"city": "Cork",
49-
"country": "IE",
48+
"city": "*** CONFIG IDENTITY IN .env ***",
49+
"country": "*** CONFIG IDENTITY IN .env ***",
5050
"manufacturer": "Brocade",
5151
"model": "FESX624"
5252
}
5353
]
5454
},
5555
{
5656
"shortname": "Infrastructure #2",
57-
"name": "IXP",
58-
"country": "IE",
59-
"url": "https:\/\/www.example.com\/",
57+
"name": "*** CONFIG IDENTITY IN .env ***",
58+
"country": "*** CONFIG IDENTITY IN .env ***",
59+
"url": "*** CONFIG IDENTITY IN .env ***",
6060
"peeringdb_id": 387,
6161
"ixf_id": 645,
6262
"ixp_id": 2,
63-
"support_email": "ixp@example.com",
64-
"support_phone": "+353 20 912 2000",
65-
"support_contact_hours": "24x7",
66-
"emergency_email": "ixp@example.com",
67-
"emergency_phone": "+353 20 912 2000",
68-
"emergency_contact_hours": "24x7",
69-
"billing_contact_hours": "8x5",
70-
"billing_email": "ixp@example.com",
71-
"billing_phone": "+353 20 912 2000",
63+
"support_email": "*** CONFIG IDENTITY IN .env ***",
64+
"support_phone": "*** CONFIG IDENTITY IN .env ***",
65+
"support_contact_hours": "*** CONFIG IDENTITY IN .env ***",
66+
"emergency_email": "*** CONFIG IDENTITY IN .env ***",
67+
"emergency_phone": "*** CONFIG IDENTITY IN .env ***",
68+
"emergency_contact_hours": "*** CONFIG IDENTITY IN .env ***",
69+
"billing_contact_hours": "*** CONFIG IDENTITY IN .env ***",
70+
"billing_email": "*** CONFIG IDENTITY IN .env ***",
71+
"billing_phone": "*** CONFIG IDENTITY IN .env ***",
7272
"peering_policy_list": [
7373
"open",
7474
"selective",
@@ -94,8 +94,8 @@
9494
"id": 2,
9595
"name": "switch2",
9696
"colo": "Location 1",
97-
"city": "Cork",
98-
"country": "IE",
97+
"city": "*** CONFIG IDENTITY IN .env ***",
98+
"country": "*** CONFIG IDENTITY IN .env ***",
9999
"manufacturer": "Brocade",
100100
"model": "FESX624"
101101
}

0 commit comments

Comments
 (0)