Commit e29a99f4 authored by Darren Patterson's avatar Darren Patterson
Browse files

release/001.001 w/ fixed class names

parent a92470c6

NEWS

+6 −0
Original line number Diff line number Diff line 
release/001.001 (2015-01-20)



    Fix class names with hyphen for puppet3. (darrenp1)

    Get rid of old RHEL4 config with jpackage. (darrenp1)

    Cleanup global variable scoping. (darrenp1)



release/001.000 (2013-09-16)



    Add /modules to all Puppet file source URLs.

manifests/cert/keystore-dir.pp→manifests/cert/keystore_dir.pp

+1 −1
Original line number Diff line number Diff line 
# Make sure the keystore directory exists



class java::cert::keystore-dir {

class java::cert::keystore_dir {

    file { '/etc/ssl/keystore':

        mode   => 710,

        owner  => 'root',

manifests/cert/pem2jks.pp

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ define java::cert::pem2jks( 
        default: { $jksFile = $keystoreFile }

    }

    case $group {

        'NONE':  { $grp = $operatingsystem ? {

        'NONE':  { $grp = $::operatingsystem ? {

                'debian' => 'ssl-cert',

                'ubuntu' => 'ssl-cert',

                'redhat' => 'root',
@@ -90,8 +90,8 @@ define java::cert::pem2jks( 
    # Include the required java-tools package and make sure the

    # /etc/ssl/keystore directory exits.

    include apache::cert::packages,

            java::cert::keystore-dir,

            packages::stanford-java-tools

            java::cert::keystore_dir,

            packages::stanford_java_tools



    # Install the cerificate

    $certFile = "/etc/ssl/certs/${name}.pem"

manifests/cert/pem2pkcs12.pp

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ define java::cert::pem2pkcs12( 
        default: { $pkcs12File = $p12File }

    }

    case $group {

        'NONE':  { $grp = $operatingsystem ? {

        'NONE':  { $grp = $::operatingsystem ? {

                'debian' => 'ssl-cert',

                'ubuntu' => 'ssl-cert',

                'redhat' => 'root',
@@ -66,8 +66,8 @@ define java::cert::pem2pkcs12( 


    # Include the required java-tools package and make sure the

    # /etc/ssl/keystore directory exits.

    include java::cert::keystore-dir,

            packages::stanford-java-tools

    include java::cert::keystore_dir,

            packages::stanford_java_tools

            

    # Install the cerificate

    $certFile = "/etc/ssl/certs/${name}.pem"

manifests/new.pp

+4 −4
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
# seems better to require explicitly choosing java version.



class java::new ($javaversion, $vendor='sun') {

  case $operatingsystem {

  case $::operatingsystem {

    'redhat': {

      case $lsbmajdistrelease {

      case $::lsbmajdistrelease {

        '4','5','6': {

          package { 

            "java-1.${javaversion}.0-${vendor}":
@@ -15,7 +15,7 @@ class java::new ($javaversion, $vendor='sun') { 
            "java-1.${javaversion}.0-${vendor}-devel": ensure => present;

          }

        }

        default: { fail("Unknown RHEL version '${lsbmajdistrelease}'") }    

        default: { fail("Unknown RHEL version '${::lsbmajdistrelease}'") }    

      }

    }

    'debian', 'ubuntu': {