diff --git a/manifests/varnish.pp b/manifests/varnish.pp index 5544e32c..c53b3fc1 100644 --- a/manifests/varnish.pp +++ b/manifests/varnish.pp @@ -1,60 +1,62 @@ # Varnish configuration class profile::varnish { $includes_dir = '/etc/varnish/includes' $includes_vcl_name = 'includes.vcl' $includes_vcl = "/etc/varnish/${includes_vcl_name}" $http_port = hiera('varnish::http_port') $backend_http_port = hiera('varnish::backend_http_port') $hsts_max_age = hiera('varnish::hsts_max_age') $listen = hiera('varnish::listen') $admin_listen = hiera('varnish::admin_listen') $admin_port = hiera('varnish::admin_port') $secret = hiera('varnish::secret') $storage_type = hiera('varnish::storage_type') $storage_size = hiera('varnish::storage_size') $storage_file = hiera('varnish::storage_file') class {'::varnish': addrepo => false, listen => $listen, admin_listen => $admin_listen, admin_port => $admin_port, secret => $secret, storage_type => $storage_type, storage_size => $storage_size, storage_file => $storage_file, } ::varnish::vcl {'/etc/varnish/default.vcl': content => template('profile/varnish/default.vcl.erb'), require => Concat[$includes_vcl], } file {$includes_dir: ensure => directory, owner => 'root', group => 'root', mode => '0644', require => Class['varnish::install'], notify => Exec['vcl_reload'], } concat {$includes_vcl: ensure => present, owner => 'root', group => 'root', mode => '0644', ensure_newline => true, require => Class['varnish::install'], notify => Exec['vcl_reload'], } concat::fragment {"${includes_vcl}:header": target => $includes_vcl, content => "# File managed with puppet (module profile::varnish)\n# All modifications will be lost\n\n", order => '00', } + + include ::profile::varnish::default_vcls }