Merge pull request #695 from liquidtelecom/add-better-postgres-support

Add better postgres support

Author: bastelfreak

spec/classes/web_spec.rb

@@ -166,6 +166,14 @@
           it { is_expected.not_to contain_class('zabbix::resources::web') }
         end
 
+        describe 'with parameter: database_schema' do
+          let :params do
+            super().merge(database_schema: 'zabbix')
+          end
+
+          it { is_expected.to contain_file('/etc/zabbix/web/zabbix.conf.php').with_content(%r{^\$DB\['SCHEMA'\] = 'zabbix'}) }
+        end
+
         it { is_expected.to contain_apache__vhost('zabbix.example.com').with_name('zabbix.example.com') }
 
         context 'with database_* settings' do

templates/web/zabbix.conf.php.erb

@@ -15,8 +15,12 @@ $DB['DATABASE'] = '<%= @database_name %>';
 $DB['USER']     = '<%= @database_user %>';
 $DB['PASSWORD'] = '<%= @database_password %>';
 
-// SCHEMA is relevant only for IBM_DB2 database
+// SCHEMA is relevant only for IBM_DB2 and PostgreSQL database
+<% if @database_schema -%>
+$DB['SCHEMA'] = '<%= @database_schema %>';
+<% else -%>
 $DB['SCHEMA'] = '';
+<% end -%>
 
 $ZBX_SERVER      = '<%= @zabbix_server %>';
 $ZBX_SERVER_PORT = '<%= @zabbix_listenport %>';