Merge branch 'master' into 'master'

Shacache now uses CDN based URL for download.


  Update configuration to use CDN based domains for download date from CDN. 

See merge request !56

software/test-slave-instance-deployment/software.cfg

@@ -142,5 +142,5 @@ setuptools = 0.9.8
 prettytable = 0.7.3-nxd001
 
 [networkcache]
-download-cache-url = http://www.shacache.org/shacache
-download-dir-url = http://www.shacache.org/shadir
\ No newline at end of file
+download-cache-url = http://download.shacache.org/
+download-dir-url = http://dir.shacache.org/
\ No newline at end of file

stack/shacache-client.cfg

@@ -3,5 +3,5 @@
 networkcache-section = networkcache
 
 [networkcache]
-download-cache-url = http://www.shacache.org/shacache
-download-dir-url = http://www.shacache.org/shadir
+download-cache-url = http://download.shacache.org/
+download-dir-url = http://dir.shacache.org/

stack/slapos.cfg

@@ -194,8 +194,8 @@ uritemplate = 0.6
 zope.interface = 4.1.3
 
 [networkcache]
-download-cache-url = http://www.shacache.org/shacache
-download-dir-url = http://www.shacache.org/shadir
+download-cache-url = http://download.shacache.org/
+download-dir-url = http://dir.shacache.org/
 
 # signature certificates of the following uploaders.
 #   Romain Courteaud