Merge pull request #46 from safing/maintain/spn-intel-20230224

maintain/spn intel 20230224

portmaster/README.md

@@ -0,0 +1,19 @@
+# Portmaster Operational Data
+
+### notifications.yaml
+
+Operational messages, warnings and other information broadcasted to all Portmaster instances.
+
+__Testing__
+
+- Put Portmaster into Dev Mode.
+- Run `curl --upload-file notifications.yaml http://127.0.0.1:817/api/v1/broadcasts/simulate`
+
+Other helpful things:
+```
+# View matching data
+curl http://127.0.0.1:817/api/v1/broadcasts/matching-data
+
+# Reset state
+curl -X POST http://127.0.0.1:817/api/v1/broadcasts/reset-state
+```

portmaster/notifications.yaml

@@ -1,5 +1,11 @@
 ---
 notifications:
+
+  # Estimated available space:
+  # 7 lines at
+  # 50-60 characters per line
+  # resuling in about 350-400 characters
+
   dangerous-setting-global-allow-incoming:
     title: "Dangerous Setting: Incoming Connections"
     message: |
@@ -39,3 +45,10 @@ notifications:
         type: open-setting
         payload:
           Key: core/releaseChannel
+
+  update-server-migrated:
+    title: "Update Server Migrated"
+    message: |
+      Yesterday (Feb 23rd), we migrated the update server into a new cluster - a necessary step since Portmaster releases are quickly becoming multi-Terabyte transfers. We are sorry for the unexpected downtime this has caused. We faced unexpected problems, but completed the migration successfully in the end.  
+      Thanks for using Portmaster and for spreading the word!
+    match: "Install.NumericDate < 20230224 and NumericVersion <= 1000007"

spn/README.md

@@ -8,4 +8,3 @@ __Testing__
 
 - Put Portmaster into Dev Mode.
 - Run `curl --upload-file main-intel.yaml http://127.0.0.1:817/api/v1/spn/map/main/intel/update`
-

spn/main-intel.yaml

@@ -6,6 +6,8 @@ BootstrapHubs:
 - tcp://95.216.13.61:17#Zwkwujs345P4ZygNZcEafawTqfZieCBVogQZ3xZPWiu7BU # heleus [FI]
 
 Hubs:
+
+  # Safing
   ZwhpYS1jWzXvPYKFhJqh1ZD3bKquLLoSoJ6RjeshmcXoFx: # voria [US]
     Trusted: true
     VerifiedOwner: Safing
@@ -54,6 +56,12 @@ Hubs:
   ZwpsJpwngWyba54AbVkCawcRQ2HP37RRQAgj5LHNR2svRf: # soalis [AU]
     Trusted: true
     VerifiedOwner: Safing
+    Override:
+      CountryCode: AU
+      Coordinates: # Sydney
+        Latitude: -33.34
+        Longitude: 151.21
+        AccuracyRadius: 20
   Zwpy5hbrQkKznJwbUmn9WpJwGkpWD9VqE2pi9yfMDQM7PK: # rin9 [FR]
     Trusted: true
     VerifiedOwner: Safing
@@ -133,13 +141,33 @@ Hubs:
     Trusted: true
     VerifiedOwner: Safing
 
-InfoOverrides:
-  workaround:
-    for: bug
+  # CoinFundIt.com
+  Zwn59zsKETQwrPQ37oiQLMDDY5SSLKpxvpZh2u2jTfLdbb: # per-spn.CoinFundIt.com [AU]
+    VerifiedOwner: CoinFundIt.com
+    Override:
+      CountryCode: AU
+      Coordinates: # Perth
+        Latitude: -31.57
+        Longitude: 115.51
+        AccuracyRadius: 20
+  ZwqBAzGqifBAFKFW1GQijNM18pi7BnWH34GyKBF7KB5fC5: # mel-spn.CoinFundIt.com [AU]
+    VerifiedOwner: CoinFundIt.com
+  ZwrqwfpgoipNdvN47AbzFQFBzH2KrhYV8wr1igUe1qhwDj: # syd-spn.CoinFundIt.com [AU]
+    VerifiedOwner: CoinFundIt.com
+  Zwv6mhprRozJMWZATXBuzrxjnXMpWncmKBeQj4xrK4M3ks: # bris-spn.CoinFundIt.com [AU]
+    VerifiedOwner: CoinFundIt.com
+    Override:
+      CountryCode: AU
+      Coordinates: # Perth
+        Latitude: -27.28
+        Longitude: 153.2
+        AccuracyRadius: 20
+
+# Advisories
 
 AdviseOnlyTrustedHubs: false
 AdviseOnlyTrustedHomeHubs: true
-AdviseOnlyTrustedDestinationHubs: true
+AdviseOnlyTrustedDestinationHubs: false
 
 HomeHubAdvisory:
 - "- Zwj52Q7d5ezvFk7HKB42dBtFu152bC9JasYF7BHB724RfG" # sono [NL] is too slow for home hub
@@ -232,4 +260,53 @@ Regions:
   - "+ PM"
   - "+ SV"
   - "+ US"
-  
+- ID: oceania-se-asia
+  Name: "Oceania & SE Asia"
+  RegionalMinLanes: 5
+  RegionalMinLanesPerHub: 0.7
+  RegionalMaxLanesOnHub: 2
+  SatelliteMinLanes: 2
+  SatelliteMinLanesPerHub: 0.3
+  InternalMinLanesOnHub: 3
+  InternalMaxHops: 3
+  MemberPolicy:
+  - "+ AS"
+  - "+ AU"
+  - "+ BN"
+  - "+ CC"
+  - "+ CK"
+  - "+ CX"
+  - "+ FJ"
+  - "+ FM"
+  - "+ GU"
+  - "+ HM"
+  - "+ ID"
+  - "+ KH"
+  - "+ KI"
+  - "+ LA"
+  - "+ MH"
+  - "+ MM"
+  - "+ MP"
+  - "+ MY"
+  - "+ NC"
+  - "+ NF"
+  - "+ NR"
+  - "+ NU"
+  - "+ NZ"
+  - "+ PF"
+  - "+ PG"
+  - "+ PH"
+  - "+ PN"
+  - "+ PW"
+  - "+ SB"
+  - "+ SG"
+  - "+ TH"
+  - "+ TK"
+  - "+ TL"
+  - "+ TO"
+  - "+ TV"
+  - "+ UM"
+  - "+ VN"
+  - "+ VU"
+  - "+ WF"
+  - "+ WS"