SF.net SVN: gar:[24604] csw/mgar/pkg/ansible/trunk

[dmichelsen at users.sourceforge.net]

Revision: 24604
          http://sourceforge.net/p/gar/code/24604
Author:   dmichelsen
Date:     2015-01-30 16:02:57 +0000 (Fri, 30 Jan 2015)
Log Message:
-----------
ansible/trunk: Preserve hosts file and comment out all examples

Modified Paths:
--------------
    csw/mgar/pkg/ansible/trunk/Makefile
    csw/mgar/pkg/ansible/trunk/files/hosts.CSW

Modified: csw/mgar/pkg/ansible/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ansible/trunk/Makefile	2015-01-30 15:01:29 UTC (rev 24603)
+++ csw/mgar/pkg/ansible/trunk/Makefile	2015-01-30 16:02:57 UTC (rev 24604)
@@ -60,7 +60,7 @@
 
 REINPLACEMENTS += etc
 REINPLACE_MATCH_etc = /etc/ansible
-REINPLACE_WITH_etc  = /etc/opt/csw/ansible
+REINPLACE_WITH_etc  = $(sysconfdir)/ansible
 REINPLACE_FILES_etc = lib/ansible/constants.py
 
 REINPLACEMENTS += usr
@@ -75,15 +75,10 @@
 
 MODULATIONS_PYTHON_VERSION = 2_6
 
+PRESERVECONF += $(sysconfdir)/ansible/hosts
+
 include gar/category.mk
 
-post-merge:
-	if [ -d $(PKGROOT)/usr/share/ansible ] ; then \
-		mv $(PKGROOT)/usr/share $(PKGROOT)$(prefix)/share ; \
-		rmdir $(PKGROOT)/usr || exit 1 ; \
-	fi
-	if [ ! -d $(PKGROOT)$(sysconfdir)/ansible ] ; then \
-		ginstall -d $(PKGROOT)$(sysconfdir)/ansible ; \
-	fi
-	cp $(FILEDIR)/hosts.CSW $(PKGROOT)$(sysconfdir)/ansible/
+post-install:
+	ginstall -D -m 0644 $(WORKDIR)/hosts.CSW $(DESTDIR)$(sysconfdir)/ansible/hosts.CSW
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/ansible/trunk/files/hosts.CSW
===================================================================
--- csw/mgar/pkg/ansible/trunk/files/hosts.CSW	2015-01-30 15:01:29 UTC (rev 24603)
+++ csw/mgar/pkg/ansible/trunk/files/hosts.CSW	2015-01-30 16:02:57 UTC (rev 24604)
@@ -10,35 +10,34 @@
 
 # Ex 1: Ungrouped hosts, specify before any group headers.
 
-green.example.com
-blue.example.com
-192.168.100.1
-192.168.100.10
+#green.example.com
+#blue.example.com
+#192.168.100.1
+#192.168.100.10
 
 # Ex 2: A collection of hosts belonging to the 'webservers' group
 
-[webservers]
-alpha.example.org
-beta.example.org
-192.168.1.100
-192.168.1.110
+#[webservers]
+#alpha.example.org
+#beta.example.org
+#192.168.1.100
+#192.168.1.110
 
 # If you have multiple hosts following a pattern you can specify
 # them like this:
 
-www[001:006].example.com
+#www[001:006].example.com
 
 # Ex 3: A collection of database servers in the 'dbservers' group
 
-[dbservers]
+#[dbservers]
+#db01.intranet.mydomain.net
+#db02.intranet.mydomain.net
+#10.25.1.56
+#10.25.1.57
 
-db01.intranet.mydomain.net
-db02.intranet.mydomain.net
-10.25.1.56
-10.25.1.57
-
 # Here's another example of host ranges, this time there are no
 # leading 0s:
 
-db-[99:101]-node.example.com
+#db-[99:101]-node.example.com
 

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