X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fsv%2Fpostgres%2Fconfigure.sh;h=6bb2b1d095a944abe95412aeb91af1f0ef9632bb;hp=4b33f11c417556424bf764122a8aaf866bb190c5;hb=22f04b9fac14adc3d3fc98273ba126c3a51792c3;hpb=2e5bb0ff5df2b7a5d527a4f896b802df31d3c6bc

diff --git a/etc/sv/postgres/configure.sh b/etc/sv/postgres/configure.sh
index 4b33f11..6bb2b1d 100644
--- a/etc/sv/postgres/configure.sh
+++ b/etc/sv/postgres/configure.sh
@@ -1,5 +1,6 @@
- # DOC: http://wiki.postgresql.org/wiki/Shared_Database_Hosting
-rule apt_get_install postgresql-9.1
+# DOC: http://wiki.postgresql.org/wiki/Shared_Database_Hosting
+
+#rule apt_get_install postgresql-9.1
 rule insserv_remove  postgresql
 rule adduser postgres \
  --disabled-login \
@@ -49,13 +50,15 @@ sudo install -m 640 -o postgres -g postgres /dev/stdin \
 sudo install -m 640 -o postgres -g postgres /dev/stdin \
  /etc/postgresql/9.1/main/pg_ident.conf <<-EOF
 	# MAPNAME       SYSTEM-USERNAME         PG-USERNAME
+	admin           postgres                postgres
+	admin           root                    postgres
 	EOF
 sudo install -m 640 -o postgres -g postgres /dev/stdin \
  /etc/postgresql/9.1/main/start.conf <<-EOF
 	EOF
 sudo install -m 640 -o postgres -g postgres /dev/stdin \
  /etc/postgresql/9.1/main/pg_hba.conf <<-EOF
-	local all postgres peer
+	local all postgres peer map=admin
 	local all all      peer
 	EOF
 sudo install -m 640 -o postgres -g postgres-data \
@@ -65,9 +68,13 @@ sudo find "$tool"/etc/postgresql/bin/ -type f -perm /+x -exec \
 	install -m 755 -o root -g root \
 	 -t /home/postgresql/bin/ {} +
 
-sudo sv -w 1 start /etc/sv/postgres
+sudo ln -fns \
+        ../sv/"$sv" \
+ /etc/service/"$sv"
+rule _runit_sv_start "$sv"
 while ! sudo -u postgres psql </dev/null
 do sleep 1; done
+
 # NOTE: supprime l'accès au schéma public depuis public,
 #       de sorte à ce que les différents utilisateurices
 #       ne voient pas leurs bases de données entre-elleux ;
@@ -105,12 +112,14 @@ sudo -u postgres psql template1 -a -f - <<-EOF
 #       et utilisateurices depuis public.
 sudo -u postgres psql template1 -a -f - <<-EOF
 	\set ON_ERROR_STOP on
-	REVOKE ALL ON pg_auth_members FROM public;
-	REVOKE ALL ON pg_authid       FROM public;
-	REVOKE ALL ON pg_database     FROM public;
-	REVOKE ALL ON pg_group        FROM public;
-	REVOKE ALL ON pg_roles        FROM public;
-	REVOKE ALL ON pg_settings     FROM public;
-	REVOKE ALL ON pg_tablespace   FROM public;
-	REVOKE ALL ON pg_user         FROM public;
+	REVOKE ALL ON ALL TABLES IN SCHEMA pg_catalog FROM public;
+	REVOKE ALL ON               SCHEMA pg_catalog FROM public;
+	-- REVOKE ALL ON pg_auth_members FROM public;
+	-- REVOKE ALL ON pg_authid       FROM public;
+	-- REVOKE ALL ON pg_database     FROM public;
+	-- REVOKE ALL ON pg_group        FROM public;
+	-- REVOKE ALL ON pg_roles        FROM public;
+	-- REVOKE ALL ON pg_settings     FROM public;
+	-- REVOKE ALL ON pg_tablespace   FROM public;
+	-- REVOKE ALL ON pg_user         FROM public;
 	EOF