[arch-commits] Commit in cloud-init/trunk (3 files)

[Jonathan Steel]

    Date: Wednesday, November 9, 2016 @ 19:28:39
  Author: jsteel
Revision: 195234

upgpkg: cloud-init 0.7.8-2

FS46543 FS46909

Added:
  cloud-init/trunk/fix-logging.patch
Modified:
  cloud-init/trunk/PKGBUILD
  cloud-init/trunk/archlinux.cloud.cfg

---------------------+
 PKGBUILD            |   49 ++++++++++++++++++++++++++++++-------------------
 archlinux.cloud.cfg |    9 ++++++++-
 fix-logging.patch   |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-09 19:12:23 UTC (rev 195233)
+++ PKGBUILD	2016-11-09 19:28:39 UTC (rev 195234)
@@ -1,30 +1,41 @@
 # $Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 
 pkgname=cloud-init
 pkgver=0.7.8
-pkgrel=1
-pkgdesc="Cloud Bootstrapping Application"
-arch=(any)
-license=("GPL3")
-url=https://launchpad.net/cloud-init
-# cloud-init python lib requirements (according to Requires file):
-depends=(systemd python2-yaml python2-cheetah python2-prettytable python2-oauth python2-boto python2-configobj python2-jsonpatch python2-jsonpointer net-tools)
+pkgrel=2
+pkgdesc="The standard for customising cloud instances"
+arch=('any')
+url="http://cloud-init.io"
+license=('GPL3')
+depends=('systemd' 'python2-yaml' 'python2-cheetah' 'python2-prettytable'
+         'python2-oauth' 'python2-boto' 'python2-configobj'
+         'python2-jsonpatch' 'python2-jsonpointer' 'net-tools'
+         'python2-requests')
 makedepends=('python2' 'python2-setuptools')
-options=(!emptydirs)
-# Archlinux specific cloud.cfg
-source=(https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha1sums=('bcc313ff188457e5a34a6643effb3583e5bd624c')
-backup=(etc/cloud/cloud.cfg etc/cloud/cloud.cfg.d/05_logging.cfg)
+backup=('etc/cloud/cloud.cfg' 'etc/cloud/cloud.cfg.d/05_logging.cfg')
+source=(https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        fix-logging.patch
+        archlinux.cloud.cfg)
+md5sums=('a522fc74f9b89200f821bda6c2ea44f1'
+         '8db4f73788f13117820e698903f849df'
+         '4c03c6d2d35c42086ed07f487f01c08a')
 
 prepare(){
-    find $pkgname-$pkgver -name \*.py -exec sed -i '1s/python$/&2/' {} +
-    sed -i '1s/python$/&2/' $pkgname-$pkgver/tools/read*
-    sed -e 's:/etc/systemd:/usr/lib/systemd:g' -e 's:\"/lib\":\"/usr/lib\":g' -i $pkgname-$pkgver/setup.py
-    sed -i 's,name: ubuntu,name: archlinux,;s,gecos: Ubuntu,gecos: Archlinux,' $srcdir/$pkgname-$pkgver/config/cloud.cfg
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i ../fix-logging.patch
+
+  find . -name \*.py -exec sed -i '1s/python$/&2/' {} +
+  sed -i '1s/python$/&2/' tools/read*
+  sed -e 's:/etc/systemd:/usr/lib/systemd:g' -e 's:\"/lib\":\"/usr/lib\":g' -i setup.py
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 ./setup.py install --root=${pkgdir} --init-system systemd
+  cd $pkgname-$pkgver
+
+  python2 ./setup.py install --root="$pkgdir" --init-system systemd
+
+  install -m644 ../archlinux.cloud.cfg "$pkgdir"/etc/cloud/cloud.cfg
 }

Modified: archlinux.cloud.cfg
===================================================================
--- archlinux.cloud.cfg	2016-11-09 19:12:23 UTC (rev 195233)
+++ archlinux.cloud.cfg	2016-11-09 19:28:39 UTC (rev 195234)
@@ -1,11 +1,15 @@
 ##
-### Archlinux cloud.cfg - This config enables Archlinux tested/compatible cloud-init modules.
+### Arch Linux cloud.cfg - This config enables Archlinux tested/compatible cloud-init modules.
 ##
 
 # Not using additional user / sudoers scheme.
 disable_root: false
+
 # Allow cloud-init to set the hostname.
 preserve_hostname: false
+
+ssh_genkeytypes: ['dsa', 'rsa', 'ecdsa', 'ed25519']
+
 # The modules that run in the 'init' stage.
 cloud_init_modules:
  - bootcmd
@@ -31,6 +35,9 @@
  - keys-to-console
  - final-message
 
+# root:log matches the rest of the logs on Arch
+syslog_fix_perms: root:log
+
 # Masquerade as ubuntu since that is the default mode.
 system_info:
    distro: ubuntu

Added: fix-logging.patch
===================================================================
--- fix-logging.patch	                        (rev 0)
+++ fix-logging.patch	2016-11-09 19:28:39 UTC (rev 195234)
@@ -0,0 +1,35 @@
+diff --git a/config/cloud.cfg.d/05_logging.cfg b/config/cloud.cfg.d/05_logging.cfg
+index 2e18073..e2ccd78 100644
+--- a/config/cloud.cfg.d/05_logging.cfg
++++ b/config/cloud.cfg.d/05_logging.cfg
+@@ -38,25 +38,18 @@ _log:
+    format=%(asctime)s - %(filename)s[%(levelname)s]: %(message)s
+    
+    [formatter_simpleFormatter]
+-   format=[CLOUDINIT] %(filename)s[%(levelname)s]: %(message)s
+- - &log_file |
+-   [handler_cloudLogHandler]
+-   class=FileHandler
+-   level=DEBUG
+-   formatter=arg0Formatter
+-   args=('/var/log/cloud-init.log',)
++   format=%(levelname)s %(filename)s: %(message)s
++
+  - &log_syslog |
+    [handler_cloudLogHandler]
+    class=handlers.SysLogHandler
+-   level=DEBUG
++   level=INFO
+    formatter=simpleFormatter
+-   args=("/dev/log", handlers.SysLogHandler.LOG_USER)
++   args=("/dev/log", handlers.SysLogHandler.LOG_DAEMON)
+ 
+ log_cfgs:
+ # These will be joined into a string that defines the configuration
+  - [ *log_base, *log_syslog ]
+-# These will be joined into a string that defines the configuration
+- - [ *log_base, *log_file ]
+ # A file path can also be used
+ # - /etc/log.conf
+ 
+