[Python-apps-commits] r13702 - in packages/slapos.core/trunk/debian (4 files)

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Wed Nov 16 05:12:50 UTC 2016 

    Date: Wednesday, November 16, 2016 @ 05:12:38
  Author: arnau
Revision: 13702

New slapos.core upstream release (1.3.18).

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg
  packages/slapos.core/trunk/debian/control
  packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2016-11-15 15:18:13 UTC (rev 13701)
+++ packages/slapos.core/trunk/debian/changelog	2016-11-16 05:12:38 UTC (rev 13702)
@@ -1,3 +1,13 @@
+slapos.core (1.3.18-1) unstable; urgency=medium
+
+  * New upstream release.
+    + d/control: Update Homepage.
+    + d/patches/*: Refresh patches.
+    + d/conf/slapos-node-unofficial.cfg: Update to match current example
+      configuration file.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 16 Nov 2016 13:10:16 +0900
+
 slapos.core (1.3.10-1) unstable; urgency=medium
 
   * New upstream release and upload to unstable.

Modified: packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg
===================================================================
--- packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg	2016-11-15 15:18:13 UTC (rev 13701)
+++ packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg	2016-11-16 05:12:38 UTC (rev 13702)
@@ -66,9 +66,9 @@
 
 [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
@@ -76,11 +76,13 @@
 #signature-private-key-file = /etc/opt/slapos/shacache/signature.key
 #signature-certificate-file = /etc/opt/slapos/shacache/signature.cert
 #upload-cache-url = https://www.shacache.org/shacache
+#shacache-ca-file = /etc/opt/slapos/shacache/ca.cert
 #shacache-cert-file = /etc/opt/slapos/shacache/shacache.cert
 #shacache-key-file = /etc/opt/slapos/shacache/shacache.key
 #upload-binary-dir-url = https://www.shacache.org/shadir
 #upload-binary-cache-url = https://www.shacache.org/shacache
 #upload-dir-url = https://www.shacache.org/shadir
+#shadir-ca-file = /etc/opt/slapos/shacache/ca.cert
 #shadir-cert-file = /etc/opt/slapos/shacache/shacache.cert
 #shadir-key-file = /etc/opt/slapos/shacache/shacache.key
 
@@ -88,11 +90,7 @@
 #   Romain Courteaud
 #   Sebastien Robin
 #   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
 #   Gabriel Monnerat
-#   Łukasz Nowak
-#   Marco Mariani
 #   Test Agent Signature
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
@@ -148,58 +146,6 @@
   If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
   -----END CERTIFICATE-----
   -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAL9FOtBJZBqAMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtOTIyMCAXDTEyMDkyNjE2MDkwM1oYDzIxMTIwOTAyMTYwOTAzWjAT
-  MREwDwYDVQQDDAhDT01QLTkyMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wlGVd6qOsc2xrtAQ5/rpflzS14/84SE/joaujMw2GGk6EFVSOcqKLq1TnHxkcCkv
-  nv1NYRPK/hpQOIKcGC1f+DvXXpMJI29R/rt2b2/y1oolxXonSVigBtCQlSyDoOFN
-  6LBX84CI5aYMvy3mqJCvfGEFBaPqze/PVugq9IpgZg0CAwEAAaNQME4wHQYDVR0O
-  BBYEFJ7HWyzVKkeSYnSK4FIwcdyng/tRMB8GA1UdIwQYMBaAFJ7HWyzVKkeSYnSK
-  4FIwcdyng/tRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAZQWob2ki
-  ie6h90FgSctozXrotb8NIis2MtLIj+WonE0wSqYefxwBmAGjB9cfWz/sNamhM4rn
-  BP1A2ojVhF6hOE1qvTP5YxcGXOoYTrEQSuDF1hn12WlA4vqIAz1f+4CiMJNlXPwh
-  7N+X2kvRpHdXAHkBOxX3j34AeCZrSpu/yDQ=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
   MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
   BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
   MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
@@ -215,12 +161,24 @@
 # List of URL(s) which shouldn't be downloaded from binary cache.
 # Any URL beginning by a blacklisted URL will be blacklisted as well.
 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
   /
 # List of URL(s) which shouldn't be uploaded into binary cache.
 # Any URL beginning by a blacklisted URL will be blacklisted as well.
 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
   /

Modified: packages/slapos.core/trunk/debian/control
===================================================================
--- packages/slapos.core/trunk/debian/control	2016-11-15 15:18:13 UTC (rev 13701)
+++ packages/slapos.core/trunk/debian/control	2016-11-16 05:12:38 UTC (rev 13702)
@@ -9,7 +9,7 @@
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.9.6
 X-Python-Version: 2.7
-Homepage: http://www.slapos.org
+Homepage: http://community.slapos.org
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/slapos.core/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/slapos.core/trunk/
 

Modified: packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch	2016-11-15 15:18:13 UTC (rev 13701)
+++ packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch	2016-11-16 05:12:38 UTC (rev 13702)
@@ -4,8 +4,8 @@
 
 --- a/slapos/grid/slapgrid.py
 +++ b/slapos/grid/slapgrid.py
-@@ -76,7 +76,7 @@
- COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME = '.slapos_latest_bang_timestamp'
+@@ -81,7 +81,7 @@
+ COMPUTER_PARTITION_INSTALL_ERROR_FILENAME = '.slapgrid-%s-error.log'
  
  # XXX hardcoded watchdog_path
 -WATCHDOG_PATH = '/opt/slapos/bin/slapos-watchdog'
@@ -39,3 +39,32 @@
      method_name = 'agregateAndSendUsage'
 -    default_pidfile = '/opt/slapos/slapgrid-ur.pid'
 +    default_pidfile = '/var/run/slapos-node-report.pid'
+--- a/slapos/grid/slapgrid.py
++++ b/slapos/grid/slapgrid.py
+@@ -422,7 +422,7 @@
+       return
+     supervisord_firewall_program_conf = """\
+ [program:firewall]
+-directory=/opt/slapos
++directory=/var/lib/slapos
+ command=%(firewall_executable)s
+ process_name=firewall
+ priority=5
+@@ -444,7 +444,7 @@
+ stderr_logfile_maxbytes=100KB
+ stderr_logfile_backups=1
+ """ %  {'firewall_executable': self.firewall_conf['firewall_executable'],
+-        'log_file': self.firewall_conf.get('log_file', '/var/log/firewall.log')}
++        'log_file': self.firewall_conf.get('log_file', '/var/log/slapos/firewall.log')}
+ 
+     if not os.path.exists(supervisord_conf_folder_path):
+       os.makedirs(supervisord_conf_folder_path)
+@@ -466,7 +466,7 @@
+       return
+     supervisord_dbus_program_conf = """\
+ [program:dbus]
+-directory=/opt/slapos
++directory=/var/lib/slapos
+ command=%(dbus_executable)s
+ process_name=dbus
+ priority=1

More information about the Python-apps-commits mailing list