summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Horn <sean_horn@opscode.com>2013-03-14 11:45:02 -0400
committerBryan McLellan <btm@opscode.com>2013-05-24 08:01:39 -0700
commitfd7dfa3ff458d1bfa6c12d528d1fa672f48135b1 (patch)
treef3f33de1ef4d4d2a2527c0dff6b99ee7eccbbbc6
parent4acdfb05e0ba41ac9caa116e2c26059b59133873 (diff)
downloadchef-fd7dfa3ff458d1bfa6c12d528d1fa672f48135b1.tar.gz
[CHEF-3471] awk not needed for bootstrap templates
Diffstat
-rw-r--r--chef/lib/chef/knife/bootstrap/archlinux-gems.erb4
-rw-r--r--chef/lib/chef/knife/bootstrap/centos5-gems.erb4
-rw-r--r--chef/lib/chef/knife/bootstrap/chef-full.erb4
-rw-r--r--chef/lib/chef/knife/bootstrap/fedora13-gems.erb4
-rw-r--r--chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb4
-rw-r--r--chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb4
-rw-r--r--chef/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb4
-rw-r--r--chef/lib/chef/knife/bootstrap/ubuntu12.10-gems.erb4
8 files changed, 16 insertions, 16 deletions
diff --git a/chef/lib/chef/knife/bootstrap/archlinux-gems.erb b/chef/lib/chef/knife/bootstrap/archlinux-gems.erb
index 4b9cd07c8f..2345b4db36 100644
--- a/chef/lib/chef/knife/bootstrap/archlinux-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/archlinux-gems.erb
@@ -11,13 +11,13 @@ fi
mkdir -p /etc/chef
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
<%= validation_key %>
EOP
chmod 0600 /etc/chef/validation.pem
<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
<%= encrypted_data_bag_secret %>
EOP
chmod 0600 /etc/chef/encrypted_data_bag_secret
diff --git a/chef/lib/chef/knife/bootstrap/centos5-gems.erb b/chef/lib/chef/knife/bootstrap/centos5-gems.erb
index 5db3c1a0e8..f2c6608c91 100644
--- a/chef/lib/chef/knife/bootstrap/centos5-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/centos5-gems.erb
@@ -28,13 +28,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
mkdir -p /etc/chef
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
<%= validation_key %>
EOP
chmod 0600 /etc/chef/validation.pem
<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
<%= encrypted_data_bag_secret %>
EOP
chmod 0600 /etc/chef/encrypted_data_bag_secret
diff --git a/chef/lib/chef/knife/bootstrap/chef-full.erb b/chef/lib/chef/knife/bootstrap/chef-full.erb
index b7d73b3442..0580dcccea 100644
--- a/chef/lib/chef/knife/bootstrap/chef-full.erb
+++ b/chef/lib/chef/knife/bootstrap/chef-full.erb
@@ -26,13 +26,13 @@ fi
mkdir -p /etc/chef
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
<%= validation_key %>
EOP
chmod 0600 /etc/chef/validation.pem
<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
<%= encrypted_data_bag_secret %>
EOP
chmod 0600 /etc/chef/encrypted_data_bag_secret
diff --git a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb b/chef/lib/chef/knife/bootstrap/fedora13-gems.erb
index e555c0652a..ab03ac497e 100644
--- a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/fedora13-gems.erb
@@ -10,13 +10,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
mkdir -p /etc/chef
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
<%= validation_key %>
EOP
chmod 0600 /etc/chef/validation.pem
<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
<%= encrypted_data_bag_secret %>
EOP
chmod 0600 /etc/chef/encrypted_data_bag_secret
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb b/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
index 93ec208ac3..55be713540 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
+++ b/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
@@ -10,13 +10,13 @@ fi
apt-get update
apt-get install -y chef
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
<%= validation_key %>
EOP
chmod 0600 /etc/chef/validation.pem
<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
<%= encrypted_data_bag_secret %>
EOP
chmod 0600 /etc/chef/encrypted_data_bag_secret
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb b/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
index f5ecc5f7b9..fe621a02c3 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
@@ -14,13 +14,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
mkdir -p /etc/chef
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
<%= validation_key %>
EOP
chmod 0600 /etc/chef/validation.pem
<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
<%= encrypted_data_bag_secret %>
EOP
chmod 0600 /etc/chef/encrypted_data_bag_secret
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb b/chef/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb
index 7d9549a125..fb1cb02012 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb
@@ -12,13 +12,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
mkdir -p /etc/chef
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
<%= validation_key %>
EOP
chmod 0600 /etc/chef/validation.pem
<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
<%= encrypted_data_bag_secret %>
EOP
chmod 0600 /etc/chef/encrypted_data_bag_secret
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu12.10-gems.erb b/chef/lib/chef/knife/bootstrap/ubuntu12.10-gems.erb
index c93c591320..a14798a96b 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu12.10-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/ubuntu12.10-gems.erb
@@ -17,7 +17,7 @@ cat <<'EOP'
<%= validation_key %>
EOP
) > /tmp/validation.pem
-awk NF /tmp/validation.pem > /etc/chef/validation.pem
+cat /tmp/validation.pem > /etc/chef/validation.pem
rm /tmp/validation.pem
chmod 0600 /etc/chef/validation.pem
@@ -27,7 +27,7 @@ cat <<'EOP'
<%= encrypted_data_bag_secret %>
EOP
) > /tmp/encrypted_data_bag_secret
-awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+cat /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
rm /tmp/encrypted_data_bag_secret
chmod 0600 /etc/chef/encrypted_data_bag_secret
<% end -%>
View Lorry Controller Status