Import from official repositories

4 files changed, 165 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..fdb1cc3980d6
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,34 @@
+pkgbase = cloud-init
+	pkgdesc = The standard for customising cloud instances
+	pkgver = 0.7.9
+	pkgrel = 1
+	url = http://cloud-init.io
+	arch = any
+	license = GPL3
+	makedepends = python2
+	makedepends = python2-setuptools
+	depends = systemd
+	depends = python2-yaml
+	depends = python2-cheetah
+	depends = python2-prettytable
+	depends = python2-oauth
+	depends = python2-boto
+	depends = python2-configobj
+	depends = python2-jsonpatch
+	depends = python2-jsonpointer
+	depends = net-tools
+	depends = python2-requests
+	depends = python2-argparse
+	depends = python2-oauthlib
+	depends = python2-jinja
+	backup = etc/cloud/cloud.cfg
+	backup = etc/cloud/cloud.cfg.d/05_logging.cfg
+	source = https://launchpad.net/cloud-init/trunk/0.7.9/+download/cloud-init-0.7.9.tar.gz
+	source = fix-logging.patch
+	source = archlinux.cloud.cfg
+	md5sums = 0a83072b25a0f96c539fa6cd45c05347
+	md5sums = 269cf6bd2337ca2fea3197aefeee5277
+	md5sums = 4c03c6d2d35c42086ed07f487f01c08a
+
+pkgname = cloud-init
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..40d4ef15e68b
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 209036 2017-01-25 11:24:26Z jsteel $
+# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+
+pkgname=cloud-init
+pkgver=0.7.9
+pkgrel=1
+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=('0a83072b25a0f96c539fa6cd45c05347'
+         '269cf6bd2337ca2fea3197aefeee5277'
+         '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
+}
diff --git a/archlinux.cloud.cfg b/archlinux.cloud.cfg
new file mode 100644
index 000000000000..b1ab8a672c06
--- /dev/null
+++ b/archlinux.cloud.cfg
@@ -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
diff --git a/fix-logging.patch b/fix-logging.patch
new file mode 100644
index 000000000000..3fe80c18751b
--- /dev/null
+++ b/fix-logging.patch
@@ -0,0 +1,35 @@
+--- a/config/cloud.cfg.d/05_logging.cfg
++++ b/config/cloud.cfg.d/05_logging.cfg
+@@ -38,19 +38,14 @@
+    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:
+ # Array entries in this list will be joined into a string
+@@ -61,7 +56,7 @@
+ #
+ # The default behavior is to just log to a file.
+ # This mechanism that does not depend on a system service to operate.
+- - [ *log_base, *log_file ]
++# - [ *log_base, *log_file ]
+ # A file path can also be used.
+ # - /etc/log.conf
+