Date: Wednesday, November 9, 2016 @ 20:04:49 Author: jsteel Revision: 195241
archrelease: copy trunk to community-testing-any Added: cloud-init/repos/community-testing-any/PKGBUILD (from rev 195240, cloud-init/trunk/PKGBUILD) cloud-init/repos/community-testing-any/archlinux.cloud.cfg (from rev 195240, cloud-init/trunk/archlinux.cloud.cfg) cloud-init/repos/community-testing-any/fix-logging.patch (from rev 195240, cloud-init/trunk/fix-logging.patch) Deleted: cloud-init/repos/community-testing-any/PKGBUILD cloud-init/repos/community-testing-any/archlinux.cloud.cfg cloud-init/repos/community-testing-any/fix-logging.patch ---------------------+ PKGBUILD | 83 +++++++++++++++++++------------------- archlinux.cloud.cfg | 108 +++++++++++++++++++++++++------------------------- fix-logging.patch | 70 ++++++++++++++++---------------- 3 files changed, 131 insertions(+), 130 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-11-09 20:04:38 UTC (rev 195240) +++ PKGBUILD 2016-11-09 20:04:49 UTC (rev 195241) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Jonathan Steel <jsteel at archlinux.org> -# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> - -pkgname=cloud-init -pkgver=0.7.8 -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') -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(){ - 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 $pkgname-$pkgver - - python2 ./setup.py install --root="$pkgdir" --init-system systemd - - install -m644 ../archlinux.cloud.cfg "$pkgdir"/etc/cloud/cloud.cfg -} Copied: cloud-init/repos/community-testing-any/PKGBUILD (from rev 195240, cloud-init/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-11-09 20:04:49 UTC (rev 195241) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Jonathan Steel <jsteel at archlinux.org> +# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> + +pkgname=cloud-init +pkgver=0.7.8 +pkgrel=3 +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' 'python2-argparse' 'python2-oauthlib' + 'python2-jinja') +makedepends=('python2' 'python2-setuptools') +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(){ + 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 $pkgname-$pkgver + + python2 ./setup.py install --root="$pkgdir" --init-system systemd + + install -m644 ../archlinux.cloud.cfg "$pkgdir"/etc/cloud/cloud.cfg +} Deleted: archlinux.cloud.cfg =================================================================== --- archlinux.cloud.cfg 2016-11-09 20:04:38 UTC (rev 195240) +++ archlinux.cloud.cfg 2016-11-09 20:04:49 UTC (rev 195241) @@ -1,54 +0,0 @@ -## -### 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 - - write-files - - set_hostname - - update_hostname - - update_etc_hosts - - users-groups - - ssh - -# The modules that run in the 'config' stage. -cloud_config_modules: - - runcmd - -# The modules that run in the 'final' stage. -cloud_final_modules: - - rightscale_userdata - - scripts-per-once - - scripts-per-boot - - scripts-per-instance - - scripts-user - - ssh-authkey-fingerprints - - 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 - default_user: - name: archlinux - lock_passwd: True - gecos: Archlinux - groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video] - sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/bash - paths: - cloud_dir: /var/lib/cloud/ - templates_dir: /etc/cloud/templates/ - ssh_svcname: sshd Copied: cloud-init/repos/community-testing-any/archlinux.cloud.cfg (from rev 195240, cloud-init/trunk/archlinux.cloud.cfg) =================================================================== --- archlinux.cloud.cfg (rev 0) +++ archlinux.cloud.cfg 2016-11-09 20:04:49 UTC (rev 195241) @@ -0,0 +1,54 @@ +## +### 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 + - write-files + - set_hostname + - update_hostname + - update_etc_hosts + - users-groups + - ssh + +# The modules that run in the 'config' stage. +cloud_config_modules: + - runcmd + +# The modules that run in the 'final' stage. +cloud_final_modules: + - rightscale_userdata + - scripts-per-once + - scripts-per-boot + - scripts-per-instance + - scripts-user + - ssh-authkey-fingerprints + - 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 + default_user: + name: archlinux + lock_passwd: True + gecos: Archlinux + groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video] + sudo: ["ALL=(ALL) NOPASSWD:ALL"] + shell: /bin/bash + paths: + cloud_dir: /var/lib/cloud/ + templates_dir: /etc/cloud/templates/ + ssh_svcname: sshd Deleted: fix-logging.patch =================================================================== --- fix-logging.patch 2016-11-09 20:04:38 UTC (rev 195240) +++ fix-logging.patch 2016-11-09 20:04:49 UTC (rev 195241) @@ -1,35 +0,0 @@ -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 - - Copied: cloud-init/repos/community-testing-any/fix-logging.patch (from rev 195240, cloud-init/trunk/fix-logging.patch) =================================================================== --- fix-logging.patch (rev 0) +++ fix-logging.patch 2016-11-09 20:04:49 UTC (rev 195241) @@ -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 + +