-# MAPNAME SYSTEM-USERNAME PG-USERNAME
-admin postgres postgres
-admin root postgres
-role postgres davical_dba
-role php5_davical davical_app
-user postgres agendav
-user root roundcube
-user /^php5_(.*)$ \1
-user /^(.*)$ \1
+# MAPNAME SYSTEM-USERNAME PG-USERNAME
+admin postgres postgres
+admin root postgres
+role postgres davical_dba
+role php_davical davical_app
+user postgres agendav
+user root roundcube
+user /^php_(.*)$ \1
+user /^(.*)$ \1