Merge branch 'master' of https://github.com/ocsigen/ocsigenserver

Author: dannywillems

Makefile

@@ -68,7 +68,7 @@ install.opt: install.META.opt install.files
 # BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody
 # BB different, make files universally accessible, we cannot chown.
 INSTALL_CAN_PUT_PERMISSIONS=yes
-INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g $(OCSIGENGROUP)
+INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g "$(OCSIGENGROUP)"
 INSTALL_MOD_660=660
 INSTALL_MOD_644=644
 INSTALL_MOD_755=755
@@ -99,7 +99,7 @@ install.files:
 	[ -p $(TEMPROOT)$(COMMANDPIPE) ] || \
 	 { mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \
 	   if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \
-	     then $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE); \
+	     then $(CHOWN) -R $(OCSIGENUSER):"$(OCSIGENGROUP)" $(TEMPROOT)$(COMMANDPIPE); \
 	   fi; }
 	 ## Configuration files
 	$(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d
@@ -162,7 +162,7 @@ logrotate:
 	 cat src/files/logrotate.in \
 	     | sed s%LOGDIR%$(LOGDIR)%g \
 	     | sed s%USER%$(OCSIGENUSER)%g \
-	     | sed s%GROUP%$(OCSIGENGROUP)%g \
+	     | sed s%GROUP%"$(OCSIGENGROUP)"%g \
 	     | sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
 	     > $(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME)
 

doc/manual-wiki/libraries.wiki

@@ -13,9 +13,9 @@ configuration file before {{{ Eliom }}}).
 There are currently two implementations of {{{ Ocsipersist }}}:
 {{{ ocsipersist-dbm.cma }}} (uses the DBM database);
 {{{ ocsipersist-sqlite.cma }}} (uses the SQLite database
-and depends on {{{ sqlite3.cma }}});
+and depends on {{{ sqlite3.cma }}} from the OPAM package sqlite3);
 {{{ ocsipersist-pgsql.cma }}} (uses the PostgreSQL (version >= 9.5)
-database and depends on {{{ pa_pgsql.cma }}});
+database and depends on {{{ pa_pgsql.cma }}} from the OPAM package pgocaml);
 >>
 
 It is possible to customize the location of the database on the 

src/Makefile

@@ -51,7 +51,7 @@ confs: ../$(PROJECTNAME).conf.sample ../local/etc/${PROJECTNAME}.conf
 	  | sed s%_LOGDIR_%$(LOGDIR)%g \
 	  | sed s%_DATADIR_%$(DATADIR)%g \
 	  | sed s%_OCSIGENUSER_%$(OCSIGENUSER)%g \
-	  | sed s%_OCSIGENGROUP_%$(OCSIGENGROUP)%g \
+	  | sed s%_OCSIGENGROUP_%"$(OCSIGENGROUP)"%g \
 	  | sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
 	  | sed s%_MIMEFILE_%$(CONFIGDIR)/mime.types%g \
 	  | sed s%_METADIR_%$(LIBDIR)%g \

src/baselib/Makefile

@@ -73,7 +73,7 @@ ocsigen_config.ml: ocsigen_config.ml.in ../../Makefile.config ../../Makefile.opt
 	| sed s%_STATICPAGESDIR_%$(STATICPAGESDIR)% \
 	| sed s%_UP_%$(UPLOADDIR)%g \
 	| sed s%_OCSIGENUSER_%$(OCSIGENUSER)%g \
-	| sed s%_OCSIGENGROUP_%$(OCSIGENGROUP)%g \
+	| sed s%_OCSIGENGROUP_%"$(OCSIGENGROUP)"%g \
 	| sed s%_PROJECTNAME_%$(PROJECTNAME)%g \
 	| sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
 	| sed s%_CONFIGDIR_%$(CONFIGDIR)% \

src/server/ocsigen_socket.ml

@@ -42,8 +42,10 @@ let make_sockets addr port =
     let ipv6_socket =
       try [make_ipv6_socket Unix.inet6_addr_any port]
       with Unix.Unix_error
-          ((Unix.EAFNOSUPPORT | Unix.EPROTONOSUPPORT),
-           _, _) -> []
+          ((Unix.EAFNOSUPPORT
+           | Unix.EPROTONOSUPPORT
+           | Unix.EADDRINUSE (* GH issue #104 *)
+           ), _, _) -> []
     in
     (make_ipv4_socket Unix.inet_addr_any port)::ipv6_socket
   | IPv4 addr ->