Merge pull request #42 from voxpupuli/add_proxy_socket

Add Support for Sockets in Varnish Proxy Listening
voxpupuli · Dec 4, 2023 · f96f4d5 · f96f4d5
2 parents b75fffc + e022159
commit f96f4d5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -90,6 +90,8 @@ The following parameters are available in the `varnish` class:
 * [`varnish_listen_port`](#-varnish--varnish_listen_port)
 * [`varnish_proxy_listen_address`](#-varnish--varnish_proxy_listen_address)
 * [`varnish_proxy_listen_port`](#-varnish--varnish_proxy_listen_port)
+* [`varnish_proxy_listen_socket`](#-varnish--varnish_proxy_listen_socket)
+* [`varnish_proxy_listen_socket_mode`](#-varnish--varnish_proxy_listen_socket_mode)
 * [`varnish_admin_listen_address`](#-varnish--varnish_admin_listen_address)
 * [`varnish_admin_listen_port`](#-varnish--varnish_admin_listen_port)
 * [`varnish_min_threads`](#-varnish--varnish_min_threads)
@@ -229,6 +231,22 @@ port varnish binds to in proxy mode
 
 Default value: `undef`
 
+##### <a name="-varnish--varnish_proxy_listen_socket"></a>`varnish_proxy_listen_socket`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+socket varnish binds to in proxy mode
+
+Default value: `undef`
+
+##### <a name="-varnish--varnish_proxy_listen_socket_mode"></a>`varnish_proxy_listen_socket_mode`
+
+Data type: `Stdlib::Filemode`
+
+Filemode for socket varnish binds to in proxy mode
+
+Default value: `'666'`
+
 ##### <a name="-varnish--varnish_admin_listen_address"></a>`varnish_admin_listen_address`
 
 Data type: `String`

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -29,6 +29,10 @@
 #   address varnish binds to in proxy mode
 # @param varnish_proxy_listen_port
 #   port varnish binds to in proxy mode
+# @param varnish_proxy_listen_socket
+#   socket varnish binds to in proxy mode
+# @param varnish_proxy_listen_socket_mode
+#   Filemode for socket varnish binds to in proxy mode
 # @param varnish_admin_listen_address
 #   address varnish binds to in admin mode
 # @param varnish_admin_listen_port
@@ -109,6 +113,8 @@
   Stdlib::Port          $varnish_listen_port          = 6081,
   String                $varnish_proxy_listen_address       = '127.0.0.1',
   Optional[Stdlib::Port]  $varnish_proxy_listen_port          = undef,
+  Optional[Stdlib::Absolutepath] $varnish_proxy_listen_socket = undef,
+  Stdlib::Filemode $varnish_proxy_listen_socket_mode = '666',
   String                $varnish_admin_listen_address = 'localhost',
   Stdlib::Port $varnish_admin_listen_port    = 6082,
   String $varnish_min_threads          = '5',

diff --git a/spec/classes/varnish_spec.rb b/spec/classes/varnish_spec.rb
@@ -56,6 +56,7 @@
       it { is_expected.to contain_file('varnish-conf').with_content(%r{VARNISH_STORAGE="malloc,\${VARNISH_STORAGE_SIZE}"}) }
       it { is_expected.to contain_file('varnish-conf').with_content(%r{VARNISH_TTL=120}) }
       it { is_expected.to contain_file('varnish-conf').with_content(%r{DAEMON_OPTS="-a :6081 }) }
+      it { is_expected.not_to contain_file('varnish-conf').with_content(%r{-a /tmp/varnish.sock,PROXY,user=varnish,group=varnish,mode=666}) }
 
       it {
         is_expected.to contain_file('storage-dir').with(
@@ -89,6 +90,16 @@
 
         it { is_expected.to compile }
         it { is_expected.to contain_file('varnish-conf').with_content(%r{-a 127.0.0.1:8443,PROXY}) }
+        it { is_expected.not_to contain_file('varnish-conf').with_content(%r{-a /tmp/varnish.sock,PROXY,user=varnish,group=varnish,mode=666}) }
+      end
+
+      context 'enable proxy socket' do
+        let :params do
+          { varnish_proxy_listen_socket: '/tmp/varnish.sock' }
+        end
+
+        it { is_expected.to compile }
+        it { is_expected.to contain_file('varnish-conf').with_content(%r{-a /tmp/varnish.sock,PROXY,user=varnish,group=varnish,mode=666}) }
       end
 
       context 'with custom configfile' do

diff --git a/templates/varnish-conf.erb b/templates/varnish-conf.erb
@@ -90,6 +90,9 @@ VARNISH_TTL=<%= scope.lookupvar('varnish_ttl') %>
 DAEMON_OPTS="-a <%= scope.lookupvar('varnish_listen_address') %>:<%= scope.lookupvar('varnish_listen_port') %> \
 <% if @varnish_proxy_listen_port -%>
             -a <%= scope.lookupvar('varnish_proxy_listen_address') %>:<%= scope.lookupvar('varnish_proxy_listen_port') %>,PROXY \
+<% end -%>
+<% if @varnish_proxy_listen_socket -%>
+            -a <%= scope.lookupvar('varnish_proxy_listen_socket') %>,PROXY,user=<%= scope.lookupvar('varnish_user') -%>,group=<%= scope.lookupvar('varnish_group') -%>,mode=<%= scope.lookupvar('varnish_proxy_listen_socket_mode') %> \
 <% end -%>
              -f <%= scope.lookupvar('varnish_vcl_conf') %> \
              -T <%= scope.lookupvar('varnish_admin_listen_address') %>:<%= scope.lookupvar('varnish_admin_listen_port') %> \