Merge branch 'jenkins-build-18' into 'master'
Auto-merge for build 18 See merge request puppet/postgresql_cd!15
This commit is contained in:
@@ -101,12 +101,12 @@ pg_hba_rule.pp
|
||||
<p>postgresql_cd::server::pghba::pg_hba_rule { ‘local access for role postgres’:</p>
|
||||
</div></p>
|
||||
|
||||
<pre class="example code"><code>psql_auth_type => 'local',
|
||||
psql_auth_database => 'all',
|
||||
psql_auth_user => 'postgres',
|
||||
psql_auth_method => 'trust',
|
||||
psql_auth_order => '001',
|
||||
psql_auth_option => '',</code></pre>
|
||||
<pre class="example code"><code>pl_auth_type => 'local',
|
||||
pl_auth_database => 'all',
|
||||
pl_auth_user => 'postgres',
|
||||
pl_auth_method => 'trust',
|
||||
pl_auth_order => '001',
|
||||
pl_auth_option => '',</code></pre>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -187,21 +187,21 @@ class postgresql_cd::server::pghba::pg_hba (
|
||||
|
||||
# manage default rules => should go into external config set
|
||||
# postgresql_cd::server::pghba::pg_hba_rule { 'local access for role postgres':
|
||||
# psql_auth_type => 'local',
|
||||
# psql_auth_database => 'all',
|
||||
# psql_auth_user => $ql_user_name,
|
||||
# psql_auth_method => 'trust',
|
||||
# psql_auth_order => '001',
|
||||
# psql_auth_option => $ql_auth_option,
|
||||
# pl_auth_type => 'local',
|
||||
# pl_auth_database => 'all',
|
||||
# pl_auth_user => $ql_user_name,
|
||||
# pl_auth_method => 'trust',
|
||||
# pl_auth_order => '001',
|
||||
# pl_auth_option => $ql_auth_option,
|
||||
# }
|
||||
|
||||
# postgresql_cd::server::pghba::pg_hba_rule { 'local access for all roles':
|
||||
# psql_auth_type => 'local',
|
||||
# psql_auth_database => 'all',
|
||||
# psql_auth_user => 'all',
|
||||
# psql_auth_method => 'trust',
|
||||
# psql_auth_order => '002',
|
||||
# psql_auth_option => $pl_auth_option,
|
||||
# pl_auth_type => 'local',
|
||||
# pl_auth_database => 'all',
|
||||
# pl_auth_user => 'all',
|
||||
# pl_auth_method => 'trust',
|
||||
# pl_auth_order => '002',
|
||||
# pl_auth_option => $pl_auth_option,
|
||||
# }
|
||||
}
|
||||
}</pre>
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
# @summary Class manages pg_hba.conf file and line entries through define
|
||||
# pg_hba_rule.pp
|
||||
# @example postgresql_cd::server::pghba::pg_hba_rule { 'local access for role postgres':
|
||||
# psql_auth_type => 'local',
|
||||
# psql_auth_database => 'all',
|
||||
# psql_auth_user => 'postgres',
|
||||
# psql_auth_method => 'trust',
|
||||
# psql_auth_order => '001',
|
||||
# psql_auth_option => '',
|
||||
# pl_auth_type => 'local',
|
||||
# pl_auth_database => 'all',
|
||||
# pl_auth_user => 'postgres',
|
||||
# pl_auth_method => 'trust',
|
||||
# pl_auth_order => '001',
|
||||
# pl_auth_option => '',
|
||||
# }
|
||||
##############################################################################
|
||||
class postgresql_cd::server::pghba::pg_hba (
|
||||
@@ -35,21 +35,21 @@ class postgresql_cd::server::pghba::pg_hba (
|
||||
|
||||
# manage default rules => should go into external config set
|
||||
# postgresql_cd::server::pghba::pg_hba_rule { 'local access for role postgres':
|
||||
# psql_auth_type => 'local',
|
||||
# psql_auth_database => 'all',
|
||||
# psql_auth_user => $ql_user_name,
|
||||
# psql_auth_method => 'trust',
|
||||
# psql_auth_order => '001',
|
||||
# psql_auth_option => $ql_auth_option,
|
||||
# pl_auth_type => 'local',
|
||||
# pl_auth_database => 'all',
|
||||
# pl_auth_user => $ql_user_name,
|
||||
# pl_auth_method => 'trust',
|
||||
# pl_auth_order => '001',
|
||||
# pl_auth_option => $ql_auth_option,
|
||||
# }
|
||||
|
||||
# postgresql_cd::server::pghba::pg_hba_rule { 'local access for all roles':
|
||||
# psql_auth_type => 'local',
|
||||
# psql_auth_database => 'all',
|
||||
# psql_auth_user => 'all',
|
||||
# psql_auth_method => 'trust',
|
||||
# psql_auth_order => '002',
|
||||
# psql_auth_option => $pl_auth_option,
|
||||
# pl_auth_type => 'local',
|
||||
# pl_auth_database => 'all',
|
||||
# pl_auth_user => 'all',
|
||||
# pl_auth_method => 'trust',
|
||||
# pl_auth_order => '002',
|
||||
# pl_auth_option => $pl_auth_option,
|
||||
# }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user