[csw-devel] SF.net SVN: gar:[16384] csw/mgar/pkg/dovecot/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 16384
          http://gar.svn.sourceforge.net/gar/?rev=16384&view=rev
Author:   jake_goerzen
Date:     2011-12-06 18:37:43 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
dovecot: install minimal configuration for fresh installs

Modified Paths:
--------------
    csw/mgar/pkg/dovecot/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/dovecot/trunk/files/dovecot-minimal.conf

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2011-12-06 13:20:21 UTC (rev 16383)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2011-12-06 18:37:43 UTC (rev 16384)
@@ -87,6 +87,15 @@
 		s| /usr/lib/dovecot| /opt/csw/lib/dovecot|; \
 		s| /usr/local| /opt/csw|;' \
 		$(WORKSRC)/doc/example-config/dovecot.conf
+	perl -pi -e '\
+		s|/etc/ssl|/opt/csw/ssl|; \
+		s|/usr/local|/opt/csw|;' \
+		$(WORKSRC)/doc/example-config/conf.d/*
+	perl -pi -e '\
+		s|/etc/ssl|/opt/csw/ssl|; \
+		s|/usr/local|/opt/csw|; \
+		s|/usr/share|/opt/csw/share|;' \
+		$(WORKSRC)/doc/wiki/*
 	@$(MAKECOOKIE)
 
 post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(NAME)
@@ -94,19 +103,13 @@
 post-install-modulated: CSWDOCS=README.CSW changelog.CSW
 post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl
 post-install-modulated:
-	perl -pi -e 's/usr\/local/opt\/csw/g' \
-		$(DESTDIR)/opt/csw/share/doc/dovecot/wiki/*
-	perl -pi -e 's/usr\/share/opt\/csw\/share/g' \
-		$(DESTDIR)/opt/csw/share/doc/dovecot/wiki/*
-	perl -pi -e 's/usr\/local/opt\/csw/g' \
-		$(DESTDIR)/opt/csw/share/doc/dovecot/example-config/conf.d/*
 
 	# Include these in the pkg. dovecot will create them otherwise
 	# with root:root ownership, which conflicts with other pkg's
 	ginstall -d $(DESTDIR)$(localstatedir)/run 
 	ginstall -d $(DESTDIR)$(localstatedir)/lib
 
-	cp $(DESTDIR)/opt/csw/share/doc/dovecot/example-config/dovecot.conf \
+	cp $(FILEDIR)/dovecot-minimal.conf \
 		$(DESTDIR)$(sysconfdir)/dovecot/dovecot.conf
 
 	# Create self-signed sample cert

Added: csw/mgar/pkg/dovecot/trunk/files/dovecot-minimal.conf
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/dovecot-minimal.conf	                        (rev 0)
+++ csw/mgar/pkg/dovecot/trunk/files/dovecot-minimal.conf	2011-12-06 18:37:43 UTC (rev 16384)
@@ -0,0 +1,7 @@
+## CSWdovecot minimal configuration
+
+# This is a minimal configuration to get CSWdovecot up and running with
+# the defaults. 
+
+ssl_cert = </etc/opt/csw/ssl/certs/dovecot.pem
+ssl_key = </etc/opt/csw/ssl/private/dovecot.pem

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.