Commit 44bb0e21 authored by Russ Allbery's avatar Russ Allbery
Browse files

Add /modules to all Puppet file source URLs

parent 095ceae2

NEWS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
release/001.001 (unreleased)



    Add /modules to all Puppet file source URLs.

manifests/cert/packages.pp

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class apache::cert::packages { 
    define apache::cert::packages::root($ensure) {

        file { "/etc/ssl/certs/${name}.pem":

            ensure  => $ensure,

            source  => "puppet:///apache/${name}.pem",

            source  => "puppet:///modules/apache/${name}.pem",

            require => $operatingsystem ? {

                'debian' => Package['ca-certificates'],

                'ubuntu' => Package['ca-certificates'],

manifests/conf.pp

+6 −6
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
# (use apache::module) or virtual hosts (use apache::site).  Example:

#

#     apache::conf {

#         '01-common':

#             source    => 'puppet:///s_www/etc/apache2/conf.d/01-common';

#         '01-01-common':

#             content   => template('s_www/01-01-common.erb'),

#       'common':

#         source    => 'puppet:///modules/s_www/etc/apache2/conf.d/common';

#       'common-extra':

#         content   => template('s_www/common-extra.erb'),

#         directory => 'fragments';

#     }

#

manifests/debian.pp

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class apache::debian { 


    # Disable weak SSL ciphers.

    file { '/etc/apache2/conf.d/ssl-strength':

        source  => 'puppet:///apache/ssl-strength.conf',

        source  => 'puppet:///modules/apache/ssl-strength.conf',

        require => Package['apache'],

        notify  => Service['apache'],

    }
@@ -21,7 +21,7 @@ class apache::debian { 
    # Replace the default Apache security configuration file with one that

    # suppresses most information disclosure about the server.

    file { '/etc/apache2/conf.d/security':

        source  => 'puppet:///apache/security.conf',

        source  => 'puppet:///modules/apache/security.conf',

        require => Package['apache'],

        notify  => Service['apache'],

    }
@@ -32,7 +32,7 @@ class apache::debian { 
        require => File['/etc/apache2/mods-available/status.conf'],

    }

    file { '/etc/apache2/mods-available/status.conf':

        source  => 'puppet:///apache/status.conf',

        source  => 'puppet:///modules/apache/status.conf',

        require => Package['apache'],

        notify  => Service['apache'],

    }

manifests/init.pp

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class apache { 


  # Default syslog filtering and iptables configuration.

  file { '/etc/filter-syslog/apache':

    source => 'puppet:///apache/filter-syslog',

    source => 'puppet:///modules/apache/filter-syslog',

  }

  base::iptables::rule { 'web':

    description => 'Allow web accesses from anywhere',