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

[arnau at users.alioth.debian.org]

    Date: Saturday, May 19, 2012 @ 08:14:57
  Author: arnau
Revision: 8729

Complete example configuration file.

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

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2012-05-19 07:58:31 UTC (rev 8728)
+++ packages/slapos.core/trunk/debian/changelog	2012-05-19 08:14:57 UTC (rev 8729)
@@ -20,11 +20,14 @@
   * debian/copyright:
     + Fix Zope license name in debian/copyright and fix GPL-3 to GPL-3+.
   * debian/control:
-    + Fix typo SaaS acronym in Descriptions.
+    + Fix typo on SaaS acronym in Descriptions.
     + Add libtool, autoconf and automake to Recommends of
       slapos-node-unofficial as they are commonly needed.
   * debian/rules: fix creation of snapshot upstream tarball.
-  
+  * debian/conf/slapos-node-unofficial.cfg:
+    + Fix typo in supervisord_socket option.
+    + Add log_file option to slapproxy section.
+
   [ Christian Perrier ]
   * Fix pending l10n issues. Debconf translations:
     + Danish (Joe Hansen). Closes: #650951

Modified: packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg
===================================================================
--- packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg	2012-05-19 07:58:31 UTC (rev 8728)
+++ packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg	2012-05-19 08:14:57 UTC (rev 8729)
@@ -5,7 +5,7 @@
 computer_id = abeautifulbutuniquename
 pidfile = /var/run/slapgrid.pid
 logfile = /var/log/slapos/slapgrid.log
-supervisord-socket = /var/run/slapgrid-supervisord.sock
+supervisord_socket = /var/run/slapgrid-supervisord.sock
 #key_file = /etc/slapos/ssl/slapos.key
 #cert_file = /etc/slapos/ssl/slapos.crt
 #certificate_repository_path = /var/cache/slapos/certificates
@@ -24,3 +24,4 @@
 host = 127.0.0.1
 port = 5000
 database_uri = /var/lib/slapos/proxy.db
+log_file = /var/log/slapos/slapproxy.log

Modified: packages/slapos.core/trunk/debian/control
===================================================================
--- packages/slapos.core/trunk/debian/control	2012-05-19 07:58:31 UTC (rev 8728)
+++ packages/slapos.core/trunk/debian/control	2012-05-19 08:14:57 UTC (rev 8729)
@@ -33,7 +33,7 @@
 Package: slapos-node-unofficial
 Architecture: all
 Provides: slapgrid,
-          slapformat,
+          slapformat
 Replaces: slapgrid,
           slapformat,
           slapos-client (<< 0.25-1~)