Merge branch 'master' into prometheus_postgres_exporter

roles/postgresql_server/templates/postgresql/pg_hba.conf.j2

@@ -1,19 +1,7 @@
 {{ ansible_managed | comment }}
 
 # TYPE  DATABASE        USER            ADDRESS                 METHOD
-
+local   all             postgres                                peer map=map_local
-# DO NOT DISABLE!
-# If you change this first entry you will need to make sure that the
-# database superuser can access the database using some other method.
-# Noninteractive access to all databases is required during automatic
-# maintenance (custom daily cronjobs, replication, and similar tasks).
-#
-# Database administrative login by Unix domain socket
-local   all             postgres                                peer map=map_root
-
-# "local" is for Unix domain socket connections only
-local   all             all                                     peer
-
 {% for host in postgresql_hosts %}  
 host "{{ host.database }}" "{{ host.user }}" {{ host.net }} {{ host.method }}
 {% endfor %}

roles/postgresql_server/templates/postgresql/pg_ident.conf.j2

@@ -1,4 +1,5 @@
 {{ ansible_managed | comment }}
 
 # MAPNAME       SYSTEM-USERNAME         PG-USERNAME
-map_root        root                    postgress
+map_local       root                    postgres
+map_local       postgres                postgres