Skip to content

update submodules in develop branch

on current develop, i did try to update all submodules. quite a lot submodules can be updated, here's the list:

--- git/leap_platform ‹develop› » git submodule foreach 'git pull origin master'
Entering 'puppet/modules/apache'
From git://code.leap.se/puppet_apache
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/apt'
From git://code.leap.se/puppet_apt
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/augeas'
From git://code.leap.se/puppet_augeas
 * branch            master     -> FETCH_HEAD
Updating 4d8c8ba..3174a2d
Fast-forward
 README | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
Entering 'puppet/modules/bundler'
From git://code.leap.se/puppet_bundler
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/common'
From git://labs.riseup.net/shared-common
 * branch            master     -> FETCH_HEAD
Updating 0961ad4..ac5da1d
Fast-forward
 manifests/defines/delete_lines.pp | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 manifests/defines/delete_lines.pp
Entering 'puppet/modules/concat'
From git://code.leap.se/puppet_concat
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/couchdb'
From git://code.leap.se/puppet_couchdb
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/git'
From git://code.leap.se/puppet_git
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/haproxy'
From git://code.leap.se/puppet_haproxy
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/lsb'
From git://labs.riseup.net/shared-lsb
 * branch            master     -> FETCH_HEAD
Updating 3742c1a..bac64e7
Fast-forward
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'puppet/modules/nagios'
From git://code.leap.se/puppet_nagios
 * branch            master     -> FETCH_HEAD
Updating 57a1140..22ec34b
Fast-forward
 README                           | 27 ++++++---------------------
 README.pnp4nagios                | 16 ++++++++++++++++
 files/munin/nagios_hosts         | 10 +++++++---
 files/munin/nagios_perf          |  8 ++++++--
 files/munin/nagios_svc           | 12 ++++++++----
 manifests/defaults/pnp4nagios.pp | 17 -----------------
 manifests/headless.pp            |  5 +++--
 manifests/munin.pp               | 41 ++++++++++++++++-------------------------
 manifests/nrpe/base.pp           |  4 +++-
 manifests/pnp4nagios.pp          | 68 +++++++++++++++++++++++++++++++++++++-------------------------------
 manifests/pnp4nagios/popup.pp    | 16 +++++++++-------
 11 files changed, 111 insertions(+), 113 deletions(-)
Entering 'puppet/modules/ntp'
From git://github.com/puppetlabs/puppetlabs-ntp
 * branch            master     -> FETCH_HEAD
Updating 27f2bc7..451c93a
Fast-forward
 .gemfile                                            |   5 ---
 .gitignore                                          |   1 +
 .travis.yml                                         |  33 +++++++++++-------
 CONTRIBUTING.md                                     |   9 +++++
 Gemfile                                             |  13 +++++++
 Modulefile                                          |   4 +--
 README.markdown                                     | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 lib/puppet/facter/README.markdown                   |  22 ------------
 lib/puppet/parser/functions/README.markdown         |  17 ---------
 lib/puppet/provider/README.markdown                 |  14 --------
 lib/puppet/type/README.markdown                     |  14 --------
 manifests/README.markdown                           |  28 ---------------
 manifests/init.pp                                   | 111 ++++++++++++++++++++++++++++++++++++++++++----------------
 spec/README.markdown                                |   7 ----
 spec/classes/ntp_spec.rb                            | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
 spec/fixtures/modules/my_ntp/templates/ntp.conf.erb |   4 +++
 templates/README.markdown                           |  23 ------------
 templates/ntp.conf.archlinux.erb                    |  24 +++++++++++++
 templates/ntp.conf.debian.erb                       |  10 +++++-
 templates/ntp.conf.el.erb                           |  12 ++++++-
 templates/ntp.conf.freebsd.erb                      |   9 ++++-
 templates/ntp.conf.suse.erb                         |  87 ++++++++++++++++++++++++++++++++++++++++++++++
 22 files changed, 483 insertions(+), 230 deletions(-)
 delete mode 100644 .gemfile
 create mode 100644 CONTRIBUTING.md
 create mode 100644 Gemfile
 delete mode 100644 lib/puppet/facter/README.markdown
 delete mode 100644 lib/puppet/parser/functions/README.markdown
 delete mode 100644 lib/puppet/provider/README.markdown
 delete mode 100644 lib/puppet/type/README.markdown
 delete mode 100644 manifests/README.markdown
 delete mode 100644 spec/README.markdown
 create mode 100644 spec/fixtures/modules/my_ntp/templates/ntp.conf.erb
 delete mode 100644 templates/README.markdown
 create mode 100644 templates/ntp.conf.archlinux.erb
 create mode 100644 templates/ntp.conf.suse.erb
Entering 'puppet/modules/openvpn'
From git://github.com/luxflux/puppet-openvpn
 * branch            master     -> FETCH_HEAD
Updating 25f1fe8..8ae6fb0
Fast-forward
 .fixtures.yml                                       |   6 ++
 .gitignore                                          |   2 +
 .rvmrc                                              |  38 +++++++++++
 Gemfile                                             |   5 ++
 Gemfile.lock                                        |  36 +++++++++++
 LICENSE                                             | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Modulefile                                          |  10 +--
 Rakefile                                            |   2 +
 Readme.markdown                                     | 144 ++++++++++++-----------------------------
 Vagrantfile                                         |  42 ++++++++++++
 manifests/client.pp                                 | 281 +++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
 manifests/client_specific_config.pp                 |  79 +++++++++++++++++++++++
 manifests/config.pp                                 |  52 +++++++++++++++
 manifests/init.pp                                   |  78 +++++++++++-----------
 manifests/install.pp                                |  46 +++++++++++++
 manifests/option.pp                                 |  24 -------
 manifests/params.pp                                 |  37 +++++++++++
 manifests/server.pp                                 | 250 ++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
 manifests/service.pp                                |  36 +++++++++++
 spec/classes/openvpn_config_spec.rb                 |  15 +++++
 spec/classes/openvpn_init_spec.rb                   |   9 +++
 spec/classes/openvpn_install_spec.rb                |  11 ++++
 spec/classes/openvpn_service_spec.rb                |  13 ++++
 spec/defines/openvpn_client_spec.rb                 |  88 +++++++++++++++++++++++++
 spec/defines/openvpn_client_specific_config_spec.rb |  40 ++++++++++++
 spec/defines/openvpn_server_spec.rb                 | 165 +++++++++++++++++++++++++++++++++++++++++++++++
 spec/spec_helper.rb                                 |   2 +
 templates/client.erb                                |  26 ++++++++
 templates/client_specific_config.erb                |  10 +++
 templates/server.erb                                |  33 ++++++++++
 vagrant/client.pp                                   |   5 ++
 vagrant/server.pp                                   |  23 +++++++
 32 files changed, 1420 insertions(+), 365 deletions(-)
 create mode 100644 .fixtures.yml
 create mode 100644 .rvmrc
 create mode 100644 Gemfile
 create mode 100644 Gemfile.lock
 create mode 100644 LICENSE
 create mode 100644 Rakefile
 create mode 100644 Vagrantfile
 create mode 100644 manifests/client_specific_config.pp
 create mode 100644 manifests/config.pp
 create mode 100644 manifests/install.pp
 delete mode 100644 manifests/option.pp
 create mode 100644 manifests/params.pp
 create mode 100644 manifests/service.pp
 create mode 100644 spec/classes/openvpn_config_spec.rb
 create mode 100644 spec/classes/openvpn_init_spec.rb
 create mode 100644 spec/classes/openvpn_install_spec.rb
 create mode 100644 spec/classes/openvpn_service_spec.rb
 create mode 100644 spec/defines/openvpn_client_spec.rb
 create mode 100644 spec/defines/openvpn_client_specific_config_spec.rb
 create mode 100644 spec/defines/openvpn_server_spec.rb
 create mode 100644 spec/spec_helper.rb
 create mode 100644 templates/client.erb
 create mode 100644 templates/client_specific_config.erb
 create mode 100644 templates/server.erb
 create mode 100644 vagrant/client.pp
 create mode 100644 vagrant/server.pp
Entering 'puppet/modules/passenger'
From git://code.leap.se/puppet_passenger
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/resolvconf'
From git://git.puppet.immerda.ch/module-resolvconf
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/ruby'
From git://code.leap.se/puppet_ruby
 * branch            master     -> FETCH_HEAD
Updating e4de25d..75f389b
Fast-forward
 manifests/devel.pp | 5 +++--
 manifests/init.pp  | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
Entering 'puppet/modules/rubygems'
From git://code.leap.se/puppet_rubygems
 * branch            master     -> FETCH_HEAD
Updating 1e5ed3d..70965a3
Fast-forward
 manifests/gpgme.pp | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)
Entering 'puppet/modules/shorewall'
From git://code.leap.se/puppet_shorewall
 * branch            master     -> FETCH_HEAD
Updating e4a54e3..3749a29
Fast-forward
 README                          |  6 ++++++
 manifests/base.pp               | 68 ++++++++++++++++++++++++++++++++++++++++----------------------------
 manifests/centos.pp             | 17 +++++++++--------
 manifests/init.pp               | 82 +++++++++++++++++++++++++++++++++++++++++++---------------------------------------
 manifests/rtrules.pp            |  2 +-
 manifests/rules/libvirt/host.pp | 50 ++++++++++++++++++++++++++++++++++++--------------
 manifests/tunnel.pp             |  2 +-
 7 files changed, 136 insertions(+), 91 deletions(-)
Entering 'puppet/modules/sshd'
From git://labs.riseup.net/shared-sshd
 * branch            master     -> FETCH_HEAD
Updating bd2e283..8ecac42
Fast-forward
 README                                    |  16 ++++++---
 lib/facter/sshkeys.rb                     |  45 ------------------------
 lib/puppet/parser/functions/ssh_keygen.rb |   5 ++-
 manifests/base.pp                         |  51 +++++++++++++++------------
 manifests/client.pp                       |  17 +++++----
 manifests/client/base.pp                  |   9 +++--
 manifests/client/linux.pp                 |   3 +-
 manifests/debian.pp                       |  10 +++---
 manifests/init.pp                         | 171 ++++++++++++++++++++++++++----------------------------------------------------------------
 manifests/libssh2.pp                      |   6 ++--
 manifests/libssh2/devel.pp                |   6 ++--
 manifests/linux.pp                        |   4 +--
 manifests/nagios.pp                       |   8 ++---
 manifests/openbsd.pp                      |   6 ++--
 manifests/redhat.pp                       |   8 ++---
 manifests/ssh_authorized_key.pp           |  12 +++----
 spec/unit/parser/functions/ssh_keygen.rb  |   2 +-
 templates/sshd_config/CentOS.erb          | 126 ++++++++++++++++++------------------------------------------------
 templates/sshd_config/CentOS_Final.erb    | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 templates/sshd_config/Debian_etch.erb     | 126 ++++++++++++++++++------------------------------------------------
 templates/sshd_config/Debian_lenny.erb    | 132 ++++++++++++++++++---------------------------------------------------
 templates/sshd_config/Debian_sid.erb      | 162 +++++++++++++++++++++----------------------------------------------------------------
 templates/sshd_config/Debian_squeeze.erb  | 162 +++++++++++++++++++++----------------------------------------------------------------
 templates/sshd_config/Debian_wheezy.erb   | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 templates/sshd_config/FreeBSD.erb         | 156 ++++++++++++++++++++--------------------------------------------------------------
 templates/sshd_config/Gentoo.erb          | 136 ++++++++++++++++++++---------------------------------------------------
 templates/sshd_config/OpenBSD.erb         | 126 +++++++++++++++++++-----------------------------------------------
 templates/sshd_config/Ubuntu.erb          | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 templates/sshd_config/Ubuntu_lucid.erb    | 138 +++++++++++++++++++-----------------------------------------------------
 templates/sshd_config/Ubuntu_precise.erb  |   1 +
 30 files changed, 864 insertions(+), 1183 deletions(-)
 delete mode 100644 lib/facter/sshkeys.rb
 mode change 120000 => 100644 templates/sshd_config/CentOS_Final.erb
 mode change 120000 => 100644 templates/sshd_config/Debian_wheezy.erb
 mode change 120000 => 100644 templates/sshd_config/Ubuntu.erb
 create mode 120000 templates/sshd_config/Ubuntu_precise.erb
Entering 'puppet/modules/stdlib'
From git://code.leap.se/puppet_stdlib
 * branch            master     -> FETCH_HEAD
Updating 66e0fa8..966f3b3
Fast-forward
 .gemfile                                                   |   5 -
 .gemspec                                                   |  40 ++++++++
 .gitignore                                                 |   4 +
 .project                                                   |  23 +++++
 .travis.yml                                                |  29 ++++--
 CHANGELOG                                                  | 105 +++++++++++++++++++-
 CONTRIBUTING.md                                            |  65 +++++++++++++
 Gemfile                                                    |  42 ++++++++
 Modulefile                                                 |   4 +-
 README.markdown                                            | 383 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 README_SPECS.markdown                                      |   7 ++
 lib/facter/facter_dot_d.rb                                 | 202 ++++++++++++++++++++++++++++++++++++++
 lib/puppet/parser/functions/any2array.rb                   |  33 +++++++
 lib/puppet/parser/functions/base64.rb                      |  37 +++++++
 lib/puppet/parser/functions/concat.rb                      |  37 +++++++
 lib/puppet/parser/functions/count.rb                       |  22 +++++
 lib/puppet/parser/functions/difference.rb                  |  36 +++++++
 lib/puppet/parser/functions/dirname.rb                     |  15 +++
 lib/puppet/parser/functions/ensure_resource.rb             |  22 +++--
 lib/puppet/parser/functions/flatten.rb                     |   2 +-
 lib/puppet/parser/functions/floor.rb                       |  20 ++++
 lib/puppet/parser/functions/getparam.rb                    |  35 +++++++
 lib/puppet/parser/functions/hash.rb                        |   2 +-
 lib/puppet/parser/functions/intersection.rb                |  34 +++++++
 lib/puppet/parser/functions/is_float.rb                    |   2 +-
 lib/puppet/parser/functions/is_function_available.rb       |  23 +++++
 lib/puppet/parser/functions/is_integer.rb                  |   2 +-
 lib/puppet/parser/functions/is_numeric.rb                  |   2 +-
 lib/puppet/parser/functions/max.rb                         |  10 +-
 lib/puppet/parser/functions/merge.rb                       |   1 +
 lib/puppet/parser/functions/min.rb                         |  10 +-
 lib/puppet/parser/functions/num2bool.rb                    |  43 +++++----
 lib/puppet/parser/functions/prefix.rb                      |   6 +-
 lib/puppet/parser/functions/str2bool.rb                    |   5 +
 lib/puppet/parser/functions/suffix.rb                      |  45 +++++++++
 lib/puppet/parser/functions/union.rb                       |  34 +++++++
 lib/puppet/parser/functions/validate_augeas.rb             |  81 ++++++++++++++++
 lib/puppet/parser/functions/validate_cmd.rb                |  47 +++++++++
 lib/puppet/provider/file_line/ruby.rb                      |   2 +-
 lib/puppet/type/anchor.rb                                  |   5 +
 spec/classes/anchor_spec.rb                                |  32 +++++++
 spec/functions/ensure_resource_spec.rb                     |  60 ++++++++----
 spec/functions/getparam_spec.rb                            |  34 +++++++
 spec/unit/facter/pe_required_facts_spec.rb                 |  69 +++++++++++++
 spec/unit/puppet/parser/functions/any2array_spec.rb        |  55 +++++++++++
 spec/unit/puppet/parser/functions/base64_spec.rb           |  34 +++++++
 spec/unit/puppet/parser/functions/concat_spec.rb           |  15 +++
 spec/unit/puppet/parser/functions/count_spec.rb            |  31 ++++++
 spec/unit/puppet/parser/functions/difference_spec.rb       |  19 ++++
 spec/unit/puppet/parser/functions/dirname_spec.rb          |  24 +++++
 spec/unit/puppet/parser/functions/flatten_spec.rb          |   4 +
 spec/unit/puppet/parser/functions/floor_spec.rb            |  39 ++++++++
 spec/unit/puppet/parser/functions/get_module_path_spec.rb  |   6 +-
 spec/unit/puppet/parser/functions/intersection_spec.rb     |  19 ++++
 spec/unit/puppet/parser/functions/is_float_spec.rb         |   4 +
 spec/unit/puppet/parser/functions/is_function_available.rb |  31 ++++++
 spec/unit/puppet/parser/functions/is_integer_spec.rb       |   5 +
 spec/unit/puppet/parser/functions/is_numeric_spec.rb       |  10 ++
 spec/unit/puppet/parser/functions/max_spec.rb              |   4 +
 spec/unit/puppet/parser/functions/merge_spec.rb            |   7 +-
 spec/unit/puppet/parser/functions/min_spec.rb              |   4 +
 spec/unit/puppet/parser/functions/num2bool_spec.rb         |  49 +++++++++-
 spec/unit/puppet/parser/functions/str2bool_spec.rb         |   7 ++
 spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb |   6 +-
 spec/unit/puppet/parser/functions/suffix_spec.rb           |  19 ++++
 spec/unit/puppet/parser/functions/union_spec.rb            |  19 ++++
 spec/unit/puppet/parser/functions/validate_array_spec.rb   |   6 +-
 spec/unit/puppet/parser/functions/validate_augeas_spec.rb  | 102 ++++++++++++++++++++
 spec/unit/puppet/parser/functions/validate_bool_spec.rb    |   8 +-
 spec/unit/puppet/parser/functions/validate_cmd_spec.rb     |  81 ++++++++++++++++
 spec/unit/puppet/parser/functions/validate_hash_spec.rb    |   6 +-
 spec/unit/puppet/parser/functions/validate_slength_spec.rb |   2 +-
 spec/unit/puppet/parser/functions/validate_string_spec.rb  |   2 +-
 spec/unit/puppet/type/file_line_spec.rb                    |   6 +-
 74 files changed, 2204 insertions(+), 137 deletions(-)
 delete mode 100644 .gemfile
 create mode 100644 .gemspec
 create mode 100644 .project
 create mode 100644 CONTRIBUTING.md
 create mode 100644 Gemfile
 create mode 100644 README_SPECS.markdown
 create mode 100644 lib/facter/facter_dot_d.rb
 create mode 100644 lib/puppet/parser/functions/any2array.rb
 create mode 100644 lib/puppet/parser/functions/base64.rb
 create mode 100644 lib/puppet/parser/functions/concat.rb
 create mode 100644 lib/puppet/parser/functions/count.rb
 create mode 100644 lib/puppet/parser/functions/difference.rb
 create mode 100644 lib/puppet/parser/functions/dirname.rb
 create mode 100644 lib/puppet/parser/functions/floor.rb
 create mode 100644 lib/puppet/parser/functions/getparam.rb
 create mode 100644 lib/puppet/parser/functions/intersection.rb
 create mode 100644 lib/puppet/parser/functions/is_function_available.rb
 create mode 100644 lib/puppet/parser/functions/suffix.rb
 create mode 100644 lib/puppet/parser/functions/union.rb
 create mode 100644 lib/puppet/parser/functions/validate_augeas.rb
 create mode 100644 lib/puppet/parser/functions/validate_cmd.rb
 create mode 100644 spec/classes/anchor_spec.rb
 create mode 100644 spec/functions/getparam_spec.rb
 create mode 100644 spec/unit/facter/pe_required_facts_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/any2array_spec.rb
 create mode 100755 spec/unit/puppet/parser/functions/base64_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/concat_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/count_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/difference_spec.rb
 create mode 100755 spec/unit/puppet/parser/functions/dirname_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/floor_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/intersection_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/is_function_available.rb
 create mode 100644 spec/unit/puppet/parser/functions/suffix_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/union_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/validate_augeas_spec.rb
 create mode 100644 spec/unit/puppet/parser/functions/validate_cmd_spec.rb
Entering 'puppet/modules/stunnel'
From git://code.leap.se/puppet_stunnel
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/tor'
From git://labs.riseup.net/shared-tor
 * branch            master     -> FETCH_HEAD
Updating a780e84..dcb6e74
Fast-forward
 manifests/daemon/map_address.pp |  2 +-
 manifests/polipo/debian.pp      |  5 +++++
 templates/torrc.global.erb      | 10 +++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)
Entering 'puppet/modules/unbound'
From git://code.leap.se/puppet_unbound
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/vcsrepo'
From git://labs.riseup.net/module_vcs
 * branch            master     -> FETCH_HEAD
Already up-to-date.
Entering 'puppet/modules/x509'
From git://code.leap.se/puppet_x509
 * branch            master     -> FETCH_HEAD
Already up-to-date.
--- git/leap_platform ‹develop* M› » gst
# On branch develop
# Changes not staged for commit:
#   (use "git add ..." to update what will be committed)
#   (use "git checkout -- ..." to discard changes in working directory)
#
#	modified:   puppet/modules/augeas (new commits)
#	modified:   puppet/modules/common (new commits)
#	modified:   puppet/modules/lsb (new commits)
#	modified:   puppet/modules/nagios (new commits)
#	modified:   puppet/modules/ntp (new commits)
#	modified:   puppet/modules/openvpn (new commits)
#	modified:   puppet/modules/ruby (new commits)
#	modified:   puppet/modules/rubygems (new commits)
#	modified:   puppet/modules/shorewall (new commits)
#	modified:   puppet/modules/sshd (new commits)
#	modified:   puppet/modules/stdlib (new commits)
#	modified:   puppet/modules/tor (new commits)
#
no changes added to commit (use "git add" and/or "git commit -a")

i would say now would be a good time to update them all, i think for all except the ssh module (where we should take a closer look) can be updated without pain.

what do you think ?

(from redmine: created on 2013-07-09, closed on 2013-09-09, relates #3139 (closed), relates #3065)