[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.9-6-ged521ee

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit acfce5980e49928391db8211795b08f8ca0c7d85
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Mar 29 16:13:50 2013 +0100

    Cosmetics: Rename some scripts for consistency; cfengine: use $(tab).
    
    Use consistent names for scripts:  If a single file is modified by a
    script, use the file's name in the script (often XX-*.conf).  Do not
    use '.conf' for all other cases.
    
    Use the less error prone $(tab)-variable instead of tabs in cfengine
    scripts.

diff --git a/fai/config/files/etc/motd/CLIENT_A b/fai/config/files/etc/motd/CLIENT_A
index aeba343..77ba407 100644
--- a/fai/config/files/etc/motd/CLIENT_A
+++ b/fai/config/files/etc/motd/CLIENT_A
@@ -1,9 +1,9 @@
 
-     Debian-LAN  --  Debian Local Area Network  CLIENT_A 
+     Debian-LAN  --  Debian Local Area Network  CLIENT_A
      ===================================================
 
 Realized by FAI:
- 
+
        Plan your installation, and FAI installs your plan.
 
 The programs included with the Debian GNU/Linux system are free software;
diff --git a/fai/config/files/etc/motd/SERVER_A b/fai/config/files/etc/motd/SERVER_A
index 893a9a0..d3e4a0f 100644
--- a/fai/config/files/etc/motd/SERVER_A
+++ b/fai/config/files/etc/motd/SERVER_A
@@ -1,9 +1,9 @@
 
-     Debian-LAN  --  Debian Local Area Network  SERVER_A 
+     Debian-LAN  --  Debian Local Area Network  SERVER_A
      ===================================================
 
 Realized by FAI:
- 
+
        Plan your installation, and FAI installs your plan.
 
 The programs included with the Debian GNU/Linux system are free software;
diff --git a/fai/config/scripts/CLIENT_A/50-umask b/fai/config/scripts/CLIENT_A/50-umask
index 9d930d3..b7d09c0 100755
--- a/fai/config/scripts/CLIENT_A/50-umask
+++ b/fai/config/scripts/CLIENT_A/50-umask
@@ -13,8 +13,8 @@ editfiles:
 	}
 	{ ${target}/etc/login.defs
 	  ## Modify default umask for more privacy:
-	  BeginGroupIfNoSuchLine "UMASK           027"
-	    ReplaceAll "^UMASK.*" With "UMASK           027"
+	  BeginGroupIfNoSuchLine "UMASK$(tab)$(tab)027"
+	    ReplaceAll "^UMASK.*" With "UMASK$(tab)$(tab)027"
 	  EndGroup
 
 	}
diff --git a/fai/config/scripts/DISKLESS_CLIENT/20-munin.conf b/fai/config/scripts/DISKLESS_CLIENT/20-munin
similarity index 100%
rename from fai/config/scripts/DISKLESS_CLIENT/20-munin.conf
rename to fai/config/scripts/DISKLESS_CLIENT/20-munin
diff --git a/fai/config/scripts/LOG_CLIENT/10-misc.conf b/fai/config/scripts/LOG_CLIENT/10-misc
similarity index 100%
rename from fai/config/scripts/LOG_CLIENT/10-misc.conf
rename to fai/config/scripts/LOG_CLIENT/10-misc
diff --git a/fai/config/scripts/LOG_SERVER/10-rsyslog_icinga.conf b/fai/config/scripts/LOG_SERVER/10-rsyslog_icinga
similarity index 100%
rename from fai/config/scripts/LOG_SERVER/10-rsyslog_icinga.conf
rename to fai/config/scripts/LOG_SERVER/10-rsyslog_icinga
diff --git a/fai/config/scripts/LOG_SERVER/20-munin.conf b/fai/config/scripts/LOG_SERVER/20-munin
similarity index 100%
rename from fai/config/scripts/LOG_SERVER/20-munin.conf
rename to fai/config/scripts/LOG_SERVER/20-munin
diff --git a/fai/config/scripts/LOG_SERVER/30-kerberize b/fai/config/scripts/LOG_SERVER/30-kerberize
index e55a18c..51cbcdb 100755
--- a/fai/config/scripts/LOG_SERVER/30-kerberize
+++ b/fai/config/scripts/LOG_SERVER/30-kerberize
@@ -26,7 +26,7 @@ editfiles:
                 With "authorized_for_all_hosts=*"
       }
       { ${target}/etc/munin/apache.conf
-          ReplaceAll "^[[:space:]]*Allow from localhost .*" With "	Allow from All"
+          ReplaceAll "^[[:space:]]*Allow from localhost .*" With "$(tab)Allow from All"
           ReplaceAll "# AuthUserFile .*" With "Krb5Keytab /etc/krb5.keytab.http"
           ReplaceAll '# AuthName "Munin"' With 'AuthName "Munin Access"'
           ReplaceAll "# AuthType Basic" With "AuthType Kerberos"
diff --git a/fai/config/scripts/PROXY/10-config b/fai/config/scripts/PROXY/10-config
index e912683..787c50e 100755
--- a/fai/config/scripts/PROXY/10-config
+++ b/fai/config/scripts/PROXY/10-config
@@ -17,11 +17,11 @@ editfiles:
 	  ReplaceAll "#acl localnet src 10.0.0.0/8" With "acl localnet src ${SUBNETMASK}"
 
 	  ## Allow CUPS access:
-	  BeginGroupIfNoSuchLine 'acl SSL_ports port 631		# cups'
+	  BeginGroupIfNoSuchLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
 	    LocateLineMatching 'acl SSL_ports port 443.*'
-	    InsertLine 'acl SSL_ports port 631		# cups'
+	    InsertLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
 	    LocateLineMatching 'acl Safe_ports port 443.*'
-	    InsertLine 'acl Safe_ports port 631		# cups'
+	    InsertLine 'acl Safe_ports port 631$(tab)$(tab)# cups'
 	  EndGroup
 
 	  ## Allow local network:
diff --git a/fai/config/scripts/SERVER_A/80-umask b/fai/config/scripts/SERVER_A/80-umask
index 9d930d3..b7d09c0 100755
--- a/fai/config/scripts/SERVER_A/80-umask
+++ b/fai/config/scripts/SERVER_A/80-umask
@@ -13,8 +13,8 @@ editfiles:
 	}
 	{ ${target}/etc/login.defs
 	  ## Modify default umask for more privacy:
-	  BeginGroupIfNoSuchLine "UMASK           027"
-	    ReplaceAll "^UMASK.*" With "UMASK           027"
+	  BeginGroupIfNoSuchLine "UMASK$(tab)$(tab)027"
+	    ReplaceAll "^UMASK.*" With "UMASK$(tab)$(tab)027"
 	  EndGroup
 
 	}

-- 
Debian-LAN development and packaging