Diff of cfengine.cf

cfengine_cf_diff.txt

$ diff -C3 /var/cfengine/masterfiles/inputs/dcsunix/users.cf ./
*** /var/cfengine/masterfiles/inputs/dcsunix/users.cf	2011-04-19 15:26:35.000000000 -0400
--- ./users.cf	2011-05-02 15:21:53.000000000 -0400
***************
*** 17,23 ****
    "dcsunixStaff" slist => { "@(var.dcsunixStaff)" };
  
    vm_cfgprdapp_01::
!     "users" slist => { "@(dcsunixStaff)", "unixsys" };
      # The cfsync user also needs to be in dcsunix, so we can automate syncing v2
      # masterfiles to the v3 server
      "dcsunixGroupMembers" slist => { "@(var.dcsunixStaff)", "cfsync" };
--- 17,23 ----
    "dcsunixStaff" slist => { "@(var.dcsunixStaff)" };
  
    vm_cfgprdapp_01::
!     "users" slist => { "@(dcsunixStaff)", "svn" };
      # The cfsync user also needs to be in dcsunix, so we can automate syncing v2
      # masterfiles to the v3 server
      "dcsunixGroupMembers" slist => { "@(var.dcsunixStaff)", "cfsync" };
***************
*** 31,39 ****
      # but adm's is /var/adm.
      "users" slist => { "@(dcsunixStaff)", "operator" };
  
-   CfgMgtVcs::
-     "users" slist => { "@(dcsunixStaff)", "svn" };
- 
  classes:
  
    "users_list_is_defined"
--- 31,36 ----
[jg685@vm-cfgprdapp-01 ~]$ diff -C3 /var/cfengine/masterfiles/inputs/dcsunix/cfengine.cf ./
*** /var/cfengine/masterfiles/inputs/dcsunix/cfengine.cf	2011-03-28 14:15:29.000000000 -0400
--- ./cfengine.cf	2011-05-01 23:25:05.000000000 -0400
***************
*** 15,29 ****
  vars:
  
    "reporthosts_negative" slist => hostsseen("12", "notseen", "name");
-   "groups"               slist => { "dcsunix", "unixsys" };  
-   "vcm_exclusions"       slist => { ".*/\.snapshot.*" };
-   "pub_exclusions"       slist => { "@(vcm_exclusions)", ".*/pri", ".*/pri/.*" };
- 
  
  files:
  
    vm_cfgprdapp_01::
  
      "/var/cfengine/masterfiles/"
        perms  => mode_owner_group("0555", "root", "root"),
        action => actionsettings_fix_silent;
--- 15,46 ----
  vars:
  
    "reporthosts_negative" slist => hostsseen("12", "notseen", "name");
  
  files:
  
    vm_cfgprdapp_01::
  
+ #### Requisite perms fixes for SVN'ed /v/c/m.
+ #    When moving to production, uncomment these and remove the promise that follows
+ #
+ #    "/var/cfengine/masterfiles/"
+ #      # Using the full-featured body here because we need to turn rxdirs off,
+ #      # which is on by default.  Otherwise, the parent dirs would lose their
+ #      # group sticky bit (0570)
+ #      perms        => permissions("0460", "root", "dcsunix", "false"),
+ #      file_select  => files_matching_leaf(".*", "@(var.filetype_plain)"),
+ #      depth_search => searchsettings_std("inf", "true"),
+ #      action       => actionsettings_fix_silent;
+ #
+ #    "/var/cfengine/masterfiles/"
+ #      # Using the full-featured body here because we need to turn rxdirs off,
+ #      # which is on by default.  Otherwise, the parent dirs would lose their
+ #      # group sticky bit (0570)
+ #      perms        => permissions("2570", "root", "dcsunix", "false"),
+ #      file_select  => files_matching_leaf(".*", "@(var.filetype_dir)"),
+ #      depth_search => searchsettings_std("inf", "true"),
+ #      action       => actionsettings_fix_silent;
+ 
      "/var/cfengine/masterfiles/"
        perms  => mode_owner_group("0555", "root", "root"),
        action => actionsettings_fix_silent;
***************
*** 71,98 ****
  
       "testharness"
         usebundle => "cf3_testharness_server";
-      
-      "vcm_groupname" 
-         comment   => "Exclude private directories from this pass, since they 
-           should be 2570 and reside in this tree",
-         usebundle => groupwrite( "/var/cfengine/masterfiles/$(groups)", 
-           "$(groups)", "2575", "@(cfengine.pub_exclusions)" );
-      "vcm_common"
-         usebundle => groupwrite( "/var/cfengine/masterfiles/common", 
-           "dcsunix", "2575", "@(cfengine.vcm_exclusions)" );
-      "vcmi_common"
-         usebundle => groupwrite( "/var/cfengine/masterfiles/inputs/common", 
-           "dcsunix", "2575", "@(cfengine.vcm_exclusions)" );
-      "vcmi_core"
-         usebundle => groupwrite( "/var/cfengine/masterfiles/inputs/core", 
-           "dcsunix", "2575", "@(cfengine.vcm_exclusions)" );
-      "vcmi_groupname"
-         usebundle => groupwrite( "/var/cfengine/masterfiles/inputs/$(groups)", 
-           "$(groups)", "2575", "@(cfengine.vcm_exclusions)" );
-      "vcmi_groupname_projects_pri"
-         usebundle => groupwrite( "/var/cfengine/masterfiles/$(groups)/.*/pri", 
-           "$(groups)", "2570", "@(cfengine.vcm_exclusions)" );
  
  classes:
  
    "reporthosts_negative_defined" expression => isvariable("reporthosts_negative");
--- 88,95 ----
  
       "testharness"
         usebundle => "cf3_testharness_server";
  
+      
  classes:
  
    "reporthosts_negative_defined" expression => isvariable("reporthosts_negative");
***************
*** 109,127 ****
  # 
  }
  
- 
- bundle agent groupwrite( dir, group, dirmode, exclusions ) {
- 
- files:
- 
-   "$(dir)"
-     perms        => mode_owner_group("$(dirmode)", "root", "$(group)"),
-     depth_search => searchsettings_exclude("inf", "@(exclusions)", "true"),
-     file_select  => files_matching_leaf(".*", "@(var.filetype_dir)"), 
-     action       => actionsettings_fix_silent;
- 
- }
- 
  bundle agent cf3_testharness_server {
  
  files:
--- 106,111 ----