comfy 0.2.6 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/lib/comfy/creator.rb +2 -2
  3. data/lib/comfy/version.rb +1 -1
  4. data/lib/templates/centos/scripts/init.sh +4 -1
  5. data/lib/templates/debian/debian.description +6 -6
  6. data/lib/templates/debian/files/DEPOT-GPG-KEY.cfg +50 -3
  7. data/lib/templates/debian/files/{depot.list → depot_jessie.list} +1 -1
  8. data/lib/templates/debian/files/depot_wheezy.list +4 -0
  9. data/lib/templates/debian/files/jessie.list +2 -0
  10. data/lib/templates/debian/files/jessie_cloud_init.pref +8 -0
  11. data/lib/templates/debian/files/meta-misc_jessie.list +2 -0
  12. data/lib/templates/debian/files/{meta-misc.list → meta-misc_wheezy.list} +0 -0
  13. data/lib/templates/debian/scripts/debian_cloud_script.sh +26 -5
  14. data/lib/templates/docker/files/DEPOT-GPG-KEY.cfg +50 -3
  15. data/lib/templates/docker/files/meta-misc.list +1 -1
  16. data/lib/templates/scientificlinux/scientificlinux.description +3 -3
  17. data/lib/templates/scientificlinux/scripts/init.sh +4 -5
  18. data/lib/templates/ubuntu/files/DEPOT-GPG-KEY.cfg +50 -3
  19. data/lib/templates/ubuntu/files/meta-misc.list +1 -1
  20. metadata +10 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 65efbfa56aac2c5a1e933ceeb85e84aa109a8037
4
- data.tar.gz: 2b0f11cc35c821d37436395a14a5502759e7cb4a
3
+ metadata.gz: a1a2e488b8db9e8014623f3b501e92a6126af6c4
4
+ data.tar.gz: 6b282b4c54d8d49de30a424c4a8eea418b47c32d
5
5
  SHA512:
6
- metadata.gz: 0baff264a10f06179fa09d3a2329c9fcc0da26f51f68e7bb68711c91fe3c826f0002f54975dd28303bf5e6a28b0ffdec0f7eaef73e54f5d7796af61526a969bd
7
- data.tar.gz: 5948fe7c600434a2598d2afc85c06d4cdbe8896a86a0c0d392b163e4f085d16d6aaf2218f68678be3a03f9ae9aabb1ec498bd035ec3fb2765a189fd18e1ea665
6
+ metadata.gz: bca6f1fb0d9151adffefa1e406899ecd2fcc10e4d87ad97116435683697a5957f8e8c3efe8c81eaf95271ce20d7c0dbc3dc68a866607f808f7ab77ea54584823
7
+ data.tar.gz: 82dcf3aa4095d62cab0c7a2ace9574c479d0b48fdc83448b96ad9b48bd8364ac46633dc6ffd30caeb491af370c607038363c8a0cc2e4f40af5e60688538417fc
data/lib/comfy/creator.rb CHANGED
@@ -73,12 +73,12 @@ class Comfy::Creator
73
73
 
74
74
  packer_binary = data[:'packer-binary'] || 'packer'
75
75
 
76
- packer = Mixlib::ShellOut.new("#{packer_binary} validate #{packer_file}")
76
+ packer = Mixlib::ShellOut.new(packer_binary, "validate", packer_file)
77
77
  packer.run_command
78
78
 
79
79
  fail Comfy::Errors::PackerValidationError, "Packer validation failed for distribution '#{data[:distribution]}': #{packer.stdout}" if packer.error?
80
80
 
81
- packer = Mixlib::ShellOut.new("#{packer_binary} build -parallel=false #{packer_file}", timeout: 5400)
81
+ packer = Mixlib::ShellOut.new(packer_binary, "build", "-parallel=false", packer_file, timeout: 5400)
82
82
  packer.live_stream = logger
83
83
  packer.run_command
84
84
 
data/lib/comfy/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Comfy
2
- VERSION = '0.2.6'
2
+ VERSION = '0.2.7'
3
3
  end
data/lib/templates/centos/scripts/init.sh CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env bash
2
2
 
3
3
  # add EPEL repository
4
- yum -y install http://ftp.astral.ro/mirrors/fedora/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
4
+ yum -y install http://ftp.astral.ro/mirrors/fedora/pub/epel/7/x86_64/e/epel-release-7-8.noarch.rpm
5
5
  # update already installed packages
6
6
  yum -y update
7
7
  # install new packages
@@ -32,6 +32,9 @@ ln -s /etc/systemd/system/getty\@ttyS0.service /etc/systemd/system/getty.target.
32
32
  mv /root/ntp.conf /etc/ntp.conf
33
33
  mv /root/xen-domU.conf /etc/dracut.conf.d/xen-domU.conf
34
34
 
35
+ # growroot
36
+ yum -y install cloud-utils
37
+
35
38
  # fail2ban
36
39
  mv /root/iptables-multiport.local /etc/fail2ban/action.d/iptables-multiport.local
37
40
  mv /root/jail.local /etc/fail2ban/jail.local
data/lib/templates/debian/debian.description CHANGED
@@ -2,18 +2,18 @@
2
2
  "name": "Debian",
3
3
  "versions": [{
4
4
  "major_version": "7",
5
- "minor_version": "9",
5
+ "minor_version": "11",
6
6
  "patch_version": "0",
7
7
  "codename": "wheezy",
8
- "iso_url": "http://cdimage.debian.org/cdimage/archive/7.9.0/amd64/iso-cd/debian-7.9.0-amd64-netinst.iso",
9
- "iso_checksum": "b6a19b4cf1d046e5eba1ae235a94824bca5a7c8f092a28216396c9d585ef709d"
8
+ "iso_url": "http://cdimage.debian.org/cdimage/archive/7.11.0/amd64/iso-cd/debian-7.11.0-amd64-netinst.iso",
9
+ "iso_checksum": "62876fb786f203bc732ec1bd2ca4c8faea19d0a97c5936d69f3406ef92ff49bd"
10
10
  },{
11
11
  "major_version": "8",
12
- "minor_version": "2",
12
+ "minor_version": "6",
13
13
  "patch_version": "0",
14
14
  "codename": "jessie",
15
- "iso_url": "http://cdimage.debian.org/debian-cd/8.2.0/amd64/iso-cd/debian-8.2.0-amd64-netinst.iso",
16
- "iso_checksum": "d393d17ac6b3113c81186e545c416a00f28ed6e05774284bb5e8f0df39fcbcb9"
15
+ "iso_url": "http://cdimage.debian.org/debian-cd/8.6.0/amd64/iso-cd/debian-8.6.0-amd64-netinst.iso",
16
+ "iso_checksum": "9479c5c2df72ae3878116c43fb42eefae53d1fe363ce514a6afc8289064b9f5f"
17
17
  }],
18
18
  "boot_command": "install auto=true priority=critical preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}",
19
19
  "qemu": {
data/lib/templates/debian/files/DEPOT-GPG-KEY.cfg CHANGED
@@ -1,5 +1,5 @@
1
1
  -----BEGIN PGP PUBLIC KEY BLOCK-----
2
- Version: GnuPG v1.4.6 (GNU/Linux)
2
+ Version: GnuPG v1.4.12 (GNU/Linux)
3
3
 
4
4
  mQINBEvVSjABEACo7dd0akbgM+C+Oph64KHYaF2Cezsv2Ngc2W/OGZ3dhCdhxbE/
5
5
  7dnt4Mm5V5eLzuevgf90Pm/W1k0AAlYPqDmiHlom45G1J+XrQqWhZNPv7HCiAj/X
@@ -27,6 +27,53 @@ qpBTPoFAWVZTsM9BQ8A/bJJBgDXg0SSnChHe4hxwQJuXR+tAO8OSk2z8xCdeRZqK
27
27
  9WAMviqmYvoCZMI4F/QJfKlSAoHrfhQPWOo2iS3aKUlBJgWxaejiJAwNwKDujnU5
28
28
  F0Y8sXypxJudVbi6/Q9BE/tGOTKwtaFiB5Gon+mGrvvnJWTGe7VjzriIRgQQEQIA
29
29
  BgUCS9VRAAAKCRCKeUuOc6DkdYCfAJ9MhgOfaAlSRnaSfZ7sfzrIept/DQCfXiGM
30
- kO6S6OD1WngSJiCst3UTkW4=
31
- =nY1A
30
+ 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
78
+ =1jV6
32
79
  -----END PGP PUBLIC KEY BLOCK-----
data/lib/templates/debian/files/{depot.list → depot_jessie.list} RENAMED
@@ -1,4 +1,4 @@
1
1
  # depot_all
2
2
  deb ftp://depot1.mc.cesnet.cz/ all main
3
3
  # depot_squeeze
4
- deb ftp://depot1.mc.cesnet.cz/ squeeze main
4
+ deb ftp://depot1.mc.cesnet.cz/ jessie main
data/lib/templates/debian/files/depot_wheezy.list ADDED
@@ -0,0 +1,4 @@
1
+ # depot_all
2
+ deb ftp://depot1.mc.cesnet.cz/ all main
3
+ # depot_squeeze
4
+ deb ftp://depot1.mc.cesnet.cz/ wheezy main
data/lib/templates/debian/files/jessie.list ADDED
@@ -0,0 +1,2 @@
1
+ deb ftp://ftp.debian.org/debian/ jessie main
2
+ deb-src ftp://ftp.debian.org/debian/ jessie main
data/lib/templates/debian/files/jessie_cloud_init.pref ADDED
@@ -0,0 +1,8 @@
1
+ # Take (only) cloud-init from jessie
2
+ Package: *
3
+ Pin: release n=jessie
4
+ Pin-Priority: -10
5
+
6
+ Package: cloud-init
7
+ Pin: release n=jessie
8
+ Pin-Priority: 910
data/lib/templates/debian/files/meta-misc_jessie.list ADDED
@@ -0,0 +1,2 @@
1
+ ## CERIT-SC's meta-misc repository
2
+ deb http://apt.cerit-sc.cz/meta_misc/ jessie main
data/lib/templates/debian/scripts/debian_cloud_script.sh CHANGED
@@ -4,14 +4,35 @@
4
4
  ######################CESNET CLOUD#########################
5
5
  ###########################################################
6
6
 
7
- mv /root/cerit-cloudinit.list /etc/apt/sources.list.d/cerit-cloudinit.list
7
+ # make sure lsb_release is installed
8
+ apt-get update
9
+ apt-get --assume-yes upgrade
10
+ apt-get --assume-yes install lsb-release
11
+
12
+ #DEB8 doesn't need cerit and jessie repo
13
+ if [[ $(lsb_release -rs) == 7.* ]]; then
14
+ mv /root/cerit-cloudinit.list /etc/apt/sources.list.d/cerit-cloudinit.list
15
+ mv /root/jessie.list /etc/apt/sources.list.d/jessie.list
16
+ mv /root/jessie_cloud_init.pref /etc/apt/preferences.d/jessie_cloud_init.pref
17
+ mv /root/depot_wheezy.list /etc/apt/sources.list.d/depot.list
18
+ rm /root/depot_jessie.list
19
+ mv /root/meta-misc_wheezy.list /etc/apt/sources.list.d/meta-misc.list
20
+ rm /root/meta-misc_jessie.list
21
+ else
22
+ rm /root/jessie.list
23
+ rm /root/jessie_cloud_init.pref
24
+ rm /root/cerit-cloudinit.list
25
+ mv /root/depot_jessie.list /etc/apt/sources.list.d/depot.list
26
+ rm /root/depot_wheezy.list
27
+ mv /root/meta-misc_jessie.list /etc/apt/sources.list.d/meta-misc.list
28
+ rm /root/meta-misc_wheezy.list
29
+ fi
30
+
8
31
  apt-key add /root/RPM-GPG-KEY-CERIT-SC.cfg
9
32
  rm -f /root/RPM-GPG-KEY-CERIT-SC.cfg
10
33
  apt-key add /root/DEPOT-GPG-KEY.cfg
11
34
  rm -f /root/DEPOT-GPG-KEY.cfg
12
35
  mv /root/backports.list /etc/apt/sources.list.d/backports.list
13
- mv /root/meta-misc.list /etc/apt/sources.list.d/meta-misc.list
14
- mv /root/depot.list /etc/apt/sources.list.d/depot.list
15
36
  mv /root/depot_all.pref /etc/apt/preferences.d/depot_all.pref
16
37
  mv /root/depot_check_mk.pref /etc/apt/preferences.d/depot_check_mk.pref
17
38
 
@@ -24,7 +45,7 @@ apt-get --assume-yes install qemu-guest-agent
24
45
  apt-get --assume-yes install fail2ban ntp
25
46
  DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" heimdal-clients libpam-heimdal
26
47
  apt-get --assume-yes install vim git
27
-
48
+ apt-get --assume-yes install cloud-initramfs-growroot
28
49
 
29
50
  # Enable services
30
51
  if [[ $(lsb_release -rs) == 7.* ]]; then
@@ -39,12 +60,12 @@ else
39
60
  systemctl enable cloud-init
40
61
  systemctl enable cloud-config
41
62
  systemctl enable cloud-final
42
- rm /etc/cloud/cloud.cfg.d/90_dpkg.cfg
43
63
  rm /etc/apt/sources.list.d/backports.list
44
64
  mv /root/getty\@ttyS0.service /etc/systemd/system/getty.target.wants/getty@ttyS0.service
45
65
  ln -s /etc/systemd/system/getty\@ttyS0.service /etc/systemd/system/getty.target.wants/getty@ttyS0.service
46
66
  fi
47
67
 
68
+ rm /etc/cloud/cloud.cfg.d/90_dpkg.cfg
48
69
  mv /root/ntp.conf /etc/ntp.conf
49
70
  mv /root/cloud.cfg /etc/cloud/cloud.cfg
50
71
  mv /root/krb5.conf /etc/krb5.conf
data/lib/templates/docker/files/DEPOT-GPG-KEY.cfg CHANGED
@@ -1,5 +1,5 @@
1
1
  -----BEGIN PGP PUBLIC KEY BLOCK-----
2
- Version: GnuPG v1.4.6 (GNU/Linux)
2
+ Version: GnuPG v1.4.12 (GNU/Linux)
3
3
 
4
4
  mQINBEvVSjABEACo7dd0akbgM+C+Oph64KHYaF2Cezsv2Ngc2W/OGZ3dhCdhxbE/
5
5
  7dnt4Mm5V5eLzuevgf90Pm/W1k0AAlYPqDmiHlom45G1J+XrQqWhZNPv7HCiAj/X
@@ -27,6 +27,53 @@ qpBTPoFAWVZTsM9BQ8A/bJJBgDXg0SSnChHe4hxwQJuXR+tAO8OSk2z8xCdeRZqK
27
27
  9WAMviqmYvoCZMI4F/QJfKlSAoHrfhQPWOo2iS3aKUlBJgWxaejiJAwNwKDujnU5
28
28
  F0Y8sXypxJudVbi6/Q9BE/tGOTKwtaFiB5Gon+mGrvvnJWTGe7VjzriIRgQQEQIA
29
29
  BgUCS9VRAAAKCRCKeUuOc6DkdYCfAJ9MhgOfaAlSRnaSfZ7sfzrIept/DQCfXiGM
30
- kO6S6OD1WngSJiCst3UTkW4=
31
- =nY1A
30
+ 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
78
+ =1jV6
32
79
  -----END PGP PUBLIC KEY BLOCK-----
data/lib/templates/docker/files/meta-misc.list CHANGED
@@ -1,2 +1,2 @@
1
1
  ## CERIT-SC's meta-misc repository
2
- deb http://apt.cerit-sc.cz/meta_misc/ wheezy main
2
+ deb [arch=amd64] http://apt.cerit-sc.cz/meta_misc/ wheezy main
data/lib/templates/scientificlinux/scientificlinux.description CHANGED
@@ -2,9 +2,9 @@
2
2
  "name": "ScientificLinux",
3
3
  "versions": [{
4
4
  "major_version": "7",
5
- "minor_version": "1",
6
- "iso_url": "http://mirror.karneval.cz/pub/linux/scientific/7/x86_64/iso/SL-7.1-x86_64-netinst.iso",
7
- "iso_checksum": "9b744b748199a7da27b181a6338b74520ea459ce80c240b8464f3842c10e79b6"
5
+ "minor_version": "2",
6
+ "iso_url": "http://mirror.karneval.cz/pub/linux/scientific/7/x86_64/iso/SL-7.2-x86_64-netinst.iso",
7
+ "iso_checksum": "d5ee154d7f6107795219eb09c600ad688472033be05b50a288c189fcb10aac5d"
8
8
  }],
9
9
  "boot_command": "linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}",
10
10
  "qemu": {
data/lib/templates/scientificlinux/scripts/init.sh CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env bash
2
2
 
3
3
  # add EPEL repository
4
- yum -y install http://ftp.astral.ro/mirrors/fedora/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
4
+ yum -y install http://ftp.astral.ro/mirrors/fedora/pub/epel/7/x86_64/e/epel-release-7-8.noarch.rpm
5
5
  # add SL7-rolling repository for python-jsonpointer
6
6
  mv /root/sl7-rolling.repo /etc/yum.repos.d/sl7-rolling.repo
7
7
  # update already installed packages
@@ -35,6 +35,9 @@ ln -s /etc/systemd/system/getty\@ttyS0.service /etc/systemd/system/getty.target.
35
35
  mv /root/ntp.conf /etc/ntp.conf
36
36
  mv /root/xen-domU.conf /etc/dracut.conf.d/xen-domU.conf
37
37
 
38
+ # growroot
39
+ yum -y install cloud-utils
40
+
38
41
  # fail2ban
39
42
  mv /root/iptables-multiport.local /etc/fail2ban/action.d/iptables-multiport.local
40
43
  mv /root/jail.local /etc/fail2ban/jail.local
@@ -75,9 +78,6 @@ chkconfig network on
75
78
  # disable NetworkManager
76
79
  systemctl disable NetworkManager
77
80
 
78
- #remove chrony to enable NTP service
79
- rpm -e chrony
80
-
81
81
  # allow to use sudo via ssh
82
82
  chmod u+w /etc/sudoers
83
83
  sed -i s/'Defaults requiretty'/'#Defaults requiretty'/g /etc/sudoers
@@ -91,4 +91,3 @@ passwd -d root
91
91
 
92
92
  rm -f ~/.bash_history
93
93
  rm -f /var/log/cloud-init*
94
-
data/lib/templates/ubuntu/files/DEPOT-GPG-KEY.cfg CHANGED
@@ -1,5 +1,5 @@
1
1
  -----BEGIN PGP PUBLIC KEY BLOCK-----
2
- Version: GnuPG v1.4.6 (GNU/Linux)
2
+ Version: GnuPG v1.4.12 (GNU/Linux)
3
3
 
4
4
  mQINBEvVSjABEACo7dd0akbgM+C+Oph64KHYaF2Cezsv2Ngc2W/OGZ3dhCdhxbE/
5
5
  7dnt4Mm5V5eLzuevgf90Pm/W1k0AAlYPqDmiHlom45G1J+XrQqWhZNPv7HCiAj/X
@@ -27,6 +27,53 @@ qpBTPoFAWVZTsM9BQ8A/bJJBgDXg0SSnChHe4hxwQJuXR+tAO8OSk2z8xCdeRZqK
27
27
  9WAMviqmYvoCZMI4F/QJfKlSAoHrfhQPWOo2iS3aKUlBJgWxaejiJAwNwKDujnU5
28
28
  F0Y8sXypxJudVbi6/Q9BE/tGOTKwtaFiB5Gon+mGrvvnJWTGe7VjzriIRgQQEQIA
29
29
  BgUCS9VRAAAKCRCKeUuOc6DkdYCfAJ9MhgOfaAlSRnaSfZ7sfzrIept/DQCfXiGM
30
- kO6S6OD1WngSJiCst3UTkW4=
31
- =nY1A
30
+ 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
78
+ =1jV6
32
79
  -----END PGP PUBLIC KEY BLOCK-----
data/lib/templates/ubuntu/files/meta-misc.list CHANGED
@@ -1,2 +1,2 @@
1
1
  ## CERIT-SC's meta-misc repository
2
- deb http://apt.cerit-sc.cz/meta_misc/ wheezy main
2
+ deb [arch=amd64] http://apt.cerit-sc.cz/meta_misc/ wheezy main
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: comfy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6
4
+ version: 0.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michal Kimle
8
- - "Ľubomír Košarišťan"
8
+ - Ľubomír Košarišťan
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-01-22 00:00:00.000000000 Z
12
+ date: 2016-11-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -266,9 +266,10 @@ files:
266
266
  - lib/templates/debian/files/backports.list
267
267
  - lib/templates/debian/files/cerit-cloudinit.list
268
268
  - lib/templates/debian/files/cloud.cfg
269
- - lib/templates/debian/files/depot.list
270
269
  - lib/templates/debian/files/depot_all.pref
271
270
  - lib/templates/debian/files/depot_check_mk.pref
271
+ - lib/templates/debian/files/depot_jessie.list
272
+ - lib/templates/debian/files/depot_wheezy.list
272
273
  - lib/templates/debian/files/fail2ban.local
273
274
  - lib/templates/debian/files/getty@ttyS0.service
274
275
  - lib/templates/debian/files/grub
@@ -276,8 +277,11 @@ files:
276
277
  - lib/templates/debian/files/interfaces
277
278
  - lib/templates/debian/files/iptables-multiport.local
278
279
  - lib/templates/debian/files/jail.local
280
+ - lib/templates/debian/files/jessie.list
281
+ - lib/templates/debian/files/jessie_cloud_init.pref
279
282
  - lib/templates/debian/files/krb5.conf
280
- - lib/templates/debian/files/meta-misc.list
283
+ - lib/templates/debian/files/meta-misc_jessie.list
284
+ - lib/templates/debian/files/meta-misc_wheezy.list
281
285
  - lib/templates/debian/files/modules
282
286
  - lib/templates/debian/files/ntp.conf
283
287
  - lib/templates/debian/files/pakiti_2.1.5-2_all.deb
@@ -368,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
368
372
  version: '0'
369
373
  requirements: []
370
374
  rubyforge_project:
371
- rubygems_version: 2.4.6
375
+ rubygems_version: 2.5.1
372
376
  signing_key:
373
377
  specification_version: 4
374
378
  summary: Tool for building virtual machine images from scratch.