From ac10d926517b9be9b9cd42685a6db38cd9d11889 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Dec 2008 14:50:53 -0500 Subject: Remove more whitespace from snippets --- snippets/download_config_files | 9 --------- snippets/func_register_if_enabled | 5 ----- snippets/main_partition_select | 1 - snippets/redhat_register | 2 -- 4 files changed, 17 deletions(-) diff --git a/snippets/download_config_files b/snippets/download_config_files index f93a2a39..865c43a9 100644 --- a/snippets/download_config_files +++ b/snippets/download_config_files @@ -1,11 +1,7 @@ - # Start download cobbler managed config files (if applicable) - #for $tkey, $tpath in $template_files.items() - #set $orig = $tpath #set $tpath = $tpath.replace("_","__").replace("/","_") - #if $getVar("system_name","") != "" #set $ttype = "system" #set $tname = $system_name @@ -13,14 +9,9 @@ #set $ttype = "profile" #set $tname = $profile_name #end if - #set $turl = "http://"+$http_server+"/cblr/svc/op/template/"+$ttype+"/"+$tname+"/path/"+$tpath - #if $orig.startswith("/") wget "$turl" --output-document="$orig" #end if - - #end for - # End download cobbler managed config files (if applicable) diff --git a/snippets/func_register_if_enabled b/snippets/func_register_if_enabled index 0a93200a..1478cf7c 100644 --- a/snippets/func_register_if_enabled +++ b/snippets/func_register_if_enabled @@ -1,22 +1,17 @@ - #if $str($getVar('func_auto_setup','')) == "1" # Start func registration section - /sbin/chkconfig --level 345 funcd on - cat << EOFM >> /etc/func/minion.conf [main] log_level = INFO acl_dir = /etc/func/minion-acl.d EOFM - cat << EOCM >> /etc/certmaster/minion.conf [main] certmaster = $func_master log_level = DEBUG cert_dir = /etc/pki/certmaster EOCM - # End func registration section #end if diff --git a/snippets/main_partition_select b/snippets/main_partition_select index 2469657a..9d996e6f 100644 --- a/snippets/main_partition_select +++ b/snippets/main_partition_select @@ -1,4 +1,3 @@ # partition selection - %include /tmp/partinfo diff --git a/snippets/redhat_register b/snippets/redhat_register index 9d0f465c..045dc7ab 100644 --- a/snippets/redhat_register +++ b/snippets/redhat_register @@ -1,4 +1,3 @@ - #if $redhat_management_type != "off" and $redhat_management_key != "" # begin Red Hat management server registration mkdir -p /usr/share/rhn/ @@ -15,4 +14,3 @@ rhnreg_ks --serverUrl=$endpoint --sslCACert=$mycert --activationkey=$redhat_mana #else # not configured to register to any Red Hat management server (ok) #end if - -- cgit