Update slapos.cfg

slapos.cfg

@@ -6,11 +6,6 @@ master_url = http://127.0.0.1:8080
 software_root = /opt/slapgrid
 instance_root = /srv/slapgrid
 
-[slapproxy]
-host = 127.0.0.1
-port = 8080
-database_uri = /opt/slapos/slapproxy.db
-
 [slapformat]
 alter_network = False
 # Replace by your network interface providing IPv6 if you don't use re6st
@@ -32,9 +27,9 @@ input_definition_file = /etc/opt/slapos/computer_definition.cfg
 
 [networkcache]
 # Define options for binary cache, used to download already compiled software.
-download-binary-cache-url = http://www.shacache.org/shacache
+download-binary-cache-url = http://download.shacache.org/
 download-cache-url = https://www.shacache.org/shacache
-download-binary-dir-url = http://www.shacache.org/shadir
+download-binary-dir-url = http://dir.shacache.org/
 
 # Configuration to Upload Configuration for Binary cache
 #upload-binary-dir-url = https://www.shacache.org/shadir
@@ -52,25 +47,11 @@ download-binary-dir-url = http://www.shacache.org/shadir
 #shadir-key-file = /etc/opt/slapos/shacache/shacache.key
 
 # List of signatures of uploaders we trust:
-#   Romain Courteaud
 #   Sebastien Robin
 #   Kazuhiko Shiozaki
 #   Gabriel Monnerat
 #   Test Agent Signature
 signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
   -----BEGIN CERTIFICATE-----
   MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
   BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
@@ -129,6 +110,9 @@ download-from-binary-cache-url-blacklist =
   https://lab.nexedi.cn/nexedi/slapos/raw/master
   https://lab.nexedi.cn/nexedi/slapos/raw/1.0/
   https://lab.nexedi.cn/nexedi/slapos/raw/erp5
+  https://lab.nexedi.com/nexedi/slapos/raw/master
+  https://lab.nexedi.com/nexedi/slapos/raw/1.0/
+  https://lab.nexedi.com/nexedi/slapos/raw/erp5
   http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD
   http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads
   /
@@ -138,6 +122,9 @@ upload-to-binary-cache-url-blacklist =
   https://lab.nexedi.cn/nexedi/slapos/raw/master
   https://lab.nexedi.cn/nexedi/slapos/raw/1.0/
   https://lab.nexedi.cn/nexedi/slapos/raw/erp5
+  https://lab.nexedi.com/nexedi/slapos/raw/master
+  https://lab.nexedi.com/nexedi/slapos/raw/1.0/
+  https://lab.nexedi.com/nexedi/slapos/raw/erp5
   http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD
   http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads
   /