Skip to content

Commit 48001d8

Browse files
author
Ilja Bobkevic
committed
Set cached directory backend as readonly
1 parent 3ab3e0a commit 48001d8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/puppet_forge_server/backends/directory.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ class Directory
2525
@@PRIORITY = 0
2626
attr_reader :PRIORITY
2727

28-
def initialize(url)
28+
def initialize(url, readonly = false)
2929
@module_dir = url
3030
@log = PuppetForgeServer::Logger.get
31+
@readonly = readonly
3132
end
3233

3334
def query_metadata(query, options = {})
@@ -45,6 +46,7 @@ def get_file_buffer(relative_path)
4546
end
4647

4748
def upload(file_data)
49+
return false if @readonly
4850
filename = File.join(@module_dir, file_data[:filename])
4951
return false if File.exist?(filename)
5052
File.open(filename, 'w') do |f|

lib/puppet_forge_server/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def start(server, options)
9393
private
9494
def backends(options)
9595
# Add directory backend for serving cached modules in case proxy flips over
96-
backends = options[:backend]['Proxy'] && ! options[:backend]['Proxy'].empty? ? [PuppetForgeServer::Backends.const_get('Directory').new(options[:cache_basedir])] : []
96+
backends = options[:backend]['Proxy'] && ! options[:backend]['Proxy'].empty? ? [PuppetForgeServer::Backends.const_get('Directory').new(options[:cache_basedir], true)] : []
9797
backends << options[:backend].map do |type, typed_backends|
9898
typed_backends.map do |url|
9999
case type

0 commit comments

Comments
 (0)