diff --git a/data/common.yaml b/data/common.yaml index a016b0b..f80c8b5 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -31,4 +31,4 @@ thumbor::statefile: 'thumbor.version' thumbor::update_enabled: true thumbor::user: 'thumbor' thumbor::version: 'present' -thumbor::venv_path: ~ +thumbor::venv_path: /opt/thumbor diff --git a/spec/classes/thumbor_spec.rb b/spec/classes/thumbor_spec.rb index d5b6a22..fe854e3 100644 --- a/spec/classes/thumbor_spec.rb +++ b/spec/classes/thumbor_spec.rb @@ -31,8 +31,8 @@ } end - it { is_expected.to contain_file('/etc/thumbor.key').with(mode: '0600') } - it { is_expected.to contain_file('/etc/thumbor.key').with_content(%r{AAAAABBBBCCCCC111112222233333}) } + it { is_expected.to contain_file('/opt/thumbor/thumbor.key').with(mode: '0600') } + it { is_expected.to contain_file('/opt/thumbor/thumbor.key').with_content(%r{AAAAABBBBCCCCC111112222233333}) } end context 'when setting config' do @@ -46,9 +46,9 @@ } end - it { is_expected.to contain_file('/etc/thumbor.conf').with_content(%r{AUTO_WEBP = True}) } - it { is_expected.to contain_file('/etc/thumbor.conf').with_content(%r{ENGINE_THREADPOOL_SIZE = 4}) } - it { is_expected.to contain_file('/etc/thumbor.conf').with_content(%r{HTTP_LOADER_MAX_CLIENTS = 1024}) } + it { is_expected.to contain_file('/opt/thumbor/thumbor.conf').with_content(%r{AUTO_WEBP = True}) } + it { is_expected.to contain_file('/opt/thumbor/thumbor.conf').with_content(%r{ENGINE_THREADPOOL_SIZE = 4}) } + it { is_expected.to contain_file('/opt/thumbor/thumbor.conf').with_content(%r{HTTP_LOADER_MAX_CLIENTS = 1024}) } end context 'when setting ports' do @@ -68,7 +68,8 @@ context 'when declaring manage_python is false' do let(:params) do { - manage_python: false + manage_python: false, + venv_path: nil } end