Commit 923ea10f authored by Russ Allbery's avatar Russ Allbery
Browse files

Directly include Git packages instead of using the git module 

The git module is kind of useless and doesn't exist in the new
environment.  Just include the Git packages directly in dev_env.
parent 8a2406eb

manifests/init.pp

+8 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
# used on the non-cardinal timeshares.



class dev_env {

    include git



    case $lsbdistcodename {

        'precise':  { include java::v6 }

        'oneiric':  { include java::v6 }
@@ -35,6 +33,9 @@ class dev_env { 
    # Operating system dependent configurations

    case $operatingsystem {

        'debian', 'ubuntu': {

            case $lsbdistcodename {

                'squeeze': { package {'git': ensure => present } }

            }

            package {

                'build-essential'  : ensure => installed;

                'cdbs'             : ensure => installed;
@@ -51,6 +52,9 @@ class dev_env { 
                'dpatch'           : ensure => installed;

                'fakeroot'         : ensure => installed;

                'git-buildpackage' : ensure => installed;

                'git-core'         : ensure => installed;

                'git-cvs'          : ensure => installed;

                'git-svn'          : ensure => installed;

                'gitk'             : ensure => installed;

                'gnupg'            : ensure => installed;

                'kernel-package'   : ensure => installed;
@@ -78,6 +82,8 @@ class dev_env { 
            package {

                'e2fsprogs-devel'  : ensure => installed;

                'gcc'              : ensure => installed;

                'git'              : ensure => installed;

                'git-gui'          : ensure => installed;

                'rpm-build'        : ensure => installed;

                'unixODBC-devel'   : ensure => installed;  # openldap

            }