From 3700b37e2386e7dbaabd90b7ba13c3dce06203d2 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Tue, 17 Jan 2006 07:11:50 +0000
Subject: Adding an "ensure" state where appropriate, and significantly
 reworking the builtin docs.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@832 980ebf18-57e1-0310-9a29-db15c13687c0
---
 examples/code/allatonce                       |  2 +-
 examples/code/classing                        |  2 +-
 examples/code/components                      |  2 +-
 examples/code/file.bl                         |  8 ++++----
 examples/code/filedefaults                    |  2 +-
 examples/code/relationships                   |  2 +-
 examples/code/simpletests                     |  8 ++++----
 examples/code/snippets/argumentdefaults       |  2 +-
 examples/code/snippets/casestatement          | 16 ++++++++--------
 examples/code/snippets/classheirarchy.pp      |  6 +++---
 examples/code/snippets/classincludes.pp       |  6 +++---
 examples/code/snippets/classpathtest          |  2 +-
 examples/code/snippets/dirchmod               |  8 ++++----
 examples/code/snippets/failmissingexecpath.pp |  2 +-
 examples/code/snippets/falsevalues.pp         |  2 +-
 examples/code/snippets/filecreate             |  8 ++++----
 examples/code/snippets/implicititeration      |  8 ++++----
 examples/code/snippets/multipleinstances      |  6 +++---
 examples/code/snippets/namevartest            |  6 +++---
 examples/code/snippets/scopetest              |  2 +-
 examples/code/snippets/selectorvalues.pp      |  6 +++---
 examples/code/snippets/simpledefaults         |  2 +-
 examples/code/snippets/simpleselector         |  8 ++++----
 23 files changed, 58 insertions(+), 58 deletions(-)

(limited to 'examples')

diff --git a/examples/code/allatonce b/examples/code/allatonce
index 2857b9b62..8912ec4e7 100644
--- a/examples/code/allatonce
+++ b/examples/code/allatonce
@@ -1,7 +1,7 @@
 # $Id$
 
 define thingie {
-    file { "/tmp/classtest": create => true, mode => 755 }
+    file { "/tmp/classtest": ensure => file, mode => 755 }
     #testing {}
 }
 
diff --git a/examples/code/classing b/examples/code/classing
index 8f9477721..0eeb713b9 100644
--- a/examples/code/classing
+++ b/examples/code/classing
@@ -12,7 +12,7 @@ class base() {
 
 class server inherits base {
     file { "/tmp/puppetfiletest":
-        create => true
+        ensure => file
     }
 }
 
diff --git a/examples/code/components b/examples/code/components
index 15f131d0e..3da43c571 100644
--- a/examples/code/components
+++ b/examples/code/components
@@ -59,7 +59,7 @@ define sleeper(path,mode) {
     }
     $files = ["/tmp/testness","/tmp/funtest"]
     file { $files:
-        create => true
+        ensure => file
     }
 }
 
diff --git a/examples/code/file.bl b/examples/code/file.bl
index 41d80b53d..ef46ba223 100644
--- a/examples/code/file.bl
+++ b/examples/code/file.bl
@@ -1,11 +1,11 @@
 # $Id$
 
 file {
-    "/tmp/atest": create => true, mode => 755;
-    "/tmp/btest": create => true, mode => 755
+    "/tmp/atest": ensure => file, mode => 755;
+    "/tmp/btest": ensure => file, mode => 755
 }
 
 file {
-    "/tmp/ctest": create => true;
-    "/tmp/dtest": create => true;
+    "/tmp/ctest": ensure => file;
+    "/tmp/dtest": ensure => file;
 }
diff --git a/examples/code/filedefaults b/examples/code/filedefaults
index cb005c093..56cf76a9a 100644
--- a/examples/code/filedefaults
+++ b/examples/code/filedefaults
@@ -6,5 +6,5 @@ File {
 }
 
 file { "/tmp/filedefaultstest":
-    create => true
+    ensure => file
 }
diff --git a/examples/code/relationships b/examples/code/relationships
index f2319d5e4..795788947 100644
--- a/examples/code/relationships
+++ b/examples/code/relationships
@@ -8,7 +8,7 @@ $path = "../examples/root/etc/configfile"
 
 define files {
     file { "/tmp/yaytest":
-        create => true,
+        ensure => file,
         mode => 755
     }
     file { "/tmp/exists":
diff --git a/examples/code/simpletests b/examples/code/simpletests
index 6a2d5c5ff..b4fd3234e 100644
--- a/examples/code/simpletests
+++ b/examples/code/simpletests
@@ -1,11 +1,11 @@
 # $Id$
 
 file {
-    "/tmp/atest": create => true;
-    "/tmp/btest": create => true
+    "/tmp/atest": ensure => file;
+    "/tmp/btest": ensure => file
 }
 
 file {
-    "/tmp/ctest": create => true;
-    "/tmp/dtest": create => true;
+    "/tmp/ctest": ensure => file;
+    "/tmp/dtest": ensure => file;
 }
diff --git a/examples/code/snippets/argumentdefaults b/examples/code/snippets/argumentdefaults
index b4081e9b0..7d814f2fb 100644
--- a/examples/code/snippets/argumentdefaults
+++ b/examples/code/snippets/argumentdefaults
@@ -1,7 +1,7 @@
 # $Id$
 
 define testargs(file, mode = 755) {
-    file { $file: create => true, mode => $mode }
+    file { $file: ensure => file, mode => $mode }
 }
 
 testargs { "testingname":
diff --git a/examples/code/snippets/casestatement b/examples/code/snippets/casestatement
index 565b8b422..05ac031e6 100644
--- a/examples/code/snippets/casestatement
+++ b/examples/code/snippets/casestatement
@@ -4,10 +4,10 @@ $var = "value"
 
 case $var {
   "nope": {
-     file { "/tmp/fakefile": mode => 644, create => true }
+     file { "/tmp/fakefile": mode => 644, ensure => file }
   }
   "value": {
-     file { "/tmp/existsfile": mode => 755, create => true }
+     file { "/tmp/existsfile": mode => 755, ensure => file }
   }
 }
 
@@ -15,15 +15,15 @@ $ovar = "yayness"
 
 case $ovar {
     "fooness": {
-         file { "/tmp/nostillexistsfile": mode => 644, create => true }
+         file { "/tmp/nostillexistsfile": mode => 644, ensure => file }
     }
     "booness", "yayness": {
         case $var {
             "nep": { 
-                 file { "/tmp/noexistsfile": mode => 644, create => true }
+                 file { "/tmp/noexistsfile": mode => 644, ensure => file }
             }
             "value": { 
-                 file { "/tmp/existsfile2": mode => 755, create => true }
+                 file { "/tmp/existsfile2": mode => 755, ensure => file }
             }
         }
     }
@@ -31,10 +31,10 @@ case $ovar {
 
 case $ovar {
     "fooness": {
-         file { "/tmp/nostillexistsfile": mode => 644, create => true }
+         file { "/tmp/nostillexistsfile": mode => 644, ensure => file }
     }
     default: {
-        file { "/tmp/existsfile3": mode => 755, create => true }
+        file { "/tmp/existsfile3": mode => 755, ensure => file }
     }
 }
 
@@ -42,6 +42,6 @@ $bool = true
 
 case $bool {
     true: {
-        file { "/tmp/existsfile4": mode => 755, create => true }
+        file { "/tmp/existsfile4": mode => 755, ensure => file }
     }
 }
diff --git a/examples/code/snippets/classheirarchy.pp b/examples/code/snippets/classheirarchy.pp
index 3f9527573..36619d8b9 100644
--- a/examples/code/snippets/classheirarchy.pp
+++ b/examples/code/snippets/classheirarchy.pp
@@ -1,15 +1,15 @@
 # $Id$
 
 class base {
-    file { "/tmp/classheir1": create => true, mode => 755 }
+    file { "/tmp/classheir1": ensure => file, mode => 755 }
 }
 
 class sub1 inherits base {
-    file { "/tmp/classheir2": create => true, mode => 755 }
+    file { "/tmp/classheir2": ensure => file, mode => 755 }
 }
 
 class sub2 inherits base {
-    file { "/tmp/classheir3": create => true, mode => 755 }
+    file { "/tmp/classheir3": ensure => file, mode => 755 }
 }
 
 include sub1, sub2
diff --git a/examples/code/snippets/classincludes.pp b/examples/code/snippets/classincludes.pp
index 3cf2bbd44..927800599 100644
--- a/examples/code/snippets/classincludes.pp
+++ b/examples/code/snippets/classincludes.pp
@@ -1,15 +1,15 @@
 # $Id$
 
 class base {
-    file { "/tmp/classincludes1": create => true, mode => 755 }
+    file { "/tmp/classincludes1": ensure => file, mode => 755 }
 }
 
 class sub1 inherits base {
-    file { "/tmp/classincludes2": create => true, mode => 755 }
+    file { "/tmp/classincludes2": ensure => file, mode => 755 }
 }
 
 class sub2 inherits base {
-    file { "/tmp/classincludes3": create => true, mode => 755 }
+    file { "/tmp/classincludes3": ensure => file, mode => 755 }
 }
 
 $sub = "sub2" 
diff --git a/examples/code/snippets/classpathtest b/examples/code/snippets/classpathtest
index 07b9e5aea..68610958b 100644
--- a/examples/code/snippets/classpathtest
+++ b/examples/code/snippets/classpathtest
@@ -1,7 +1,7 @@
 # $Id$
 
 define component {
-    file { "/tmp/classtest": create => true, mode => 755 }
+    file { "/tmp/classtest": ensure => file, mode => 755 }
 }
 
 class testing {
diff --git a/examples/code/snippets/dirchmod b/examples/code/snippets/dirchmod
index 0a8268fa8..dc2cc8949 100644
--- a/examples/code/snippets/dirchmod
+++ b/examples/code/snippets/dirchmod
@@ -1,8 +1,8 @@
 # $Id$
 
 file {
-    "/tmp/dirchmodtesta": create => directory;
-    "/tmp/dirchmodtesta/testing": create => true
+    "/tmp/dirchmodtesta": ensure => directory;
+    "/tmp/dirchmodtesta/testing": ensure => file
 }
 
 file { "/tmp/dirchmodtesta":
@@ -10,8 +10,8 @@ file { "/tmp/dirchmodtesta":
 }
 
 file {
-    "/tmp/dirchmodtestb": create => directory;
-    "/tmp/dirchmodtestb/testing": create => true
+    "/tmp/dirchmodtestb": ensure => directory;
+    "/tmp/dirchmodtestb/testing": ensure => file
 }
 
 file { "/tmp/dirchmodtestb":
diff --git a/examples/code/snippets/failmissingexecpath.pp b/examples/code/snippets/failmissingexecpath.pp
index 3f43be325..fe17b049b 100644
--- a/examples/code/snippets/failmissingexecpath.pp
+++ b/examples/code/snippets/failmissingexecpath.pp
@@ -1,6 +1,6 @@
 define distloc(path) {
     file { "/tmp/exectesting1":
-        create => file
+        ensure => file
     }
     exec { "touch $path":
         subscribe => file["/tmp/exectesting1"],
diff --git a/examples/code/snippets/falsevalues.pp b/examples/code/snippets/falsevalues.pp
index 21f957bd2..2143b79a7 100644
--- a/examples/code/snippets/falsevalues.pp
+++ b/examples/code/snippets/falsevalues.pp
@@ -1,3 +1,3 @@
 $value = false
 
-file { "/tmp/falsevalues$value": create => true }
+file { "/tmp/falsevalues$value": ensure => file }
diff --git a/examples/code/snippets/filecreate b/examples/code/snippets/filecreate
index 7a4cdbb1e..d7972c234 100644
--- a/examples/code/snippets/filecreate
+++ b/examples/code/snippets/filecreate
@@ -1,11 +1,11 @@
 # $Id$
 
 file {
-    "/tmp/createatest": create => true, mode => 755;
-    "/tmp/createbtest": create => true, mode => 755
+    "/tmp/createatest": ensure => file, mode => 755;
+    "/tmp/createbtest": ensure => file, mode => 755
 }
 
 file {
-    "/tmp/createctest": create => true;
-    "/tmp/createdtest": create => true;
+    "/tmp/createctest": ensure => file;
+    "/tmp/createdtest": ensure => file;
 }
diff --git a/examples/code/snippets/implicititeration b/examples/code/snippets/implicititeration
index c4a850a94..6f34cb29c 100644
--- a/examples/code/snippets/implicititeration
+++ b/examples/code/snippets/implicititeration
@@ -2,14 +2,14 @@
 
 $files = ["/tmp/iterationatest", "/tmp/iterationbtest"]
 
-file { $files: create => true, mode => 755 }
+file { $files: ensure => file, mode => 755 }
 
 file { ["/tmp/iterationctest", "/tmp/iterationdtest"]:
-    create => true,
+    ensure => file,
     mode => 755
 }
 
 file {
-    ["/tmp/iterationetest", "/tmp/iterationftest"]: create => true, mode => 755;
-    ["/tmp/iterationgtest", "/tmp/iterationhtest"]: create => true, mode => 755;
+    ["/tmp/iterationetest", "/tmp/iterationftest"]: ensure => file, mode => 755;
+    ["/tmp/iterationgtest", "/tmp/iterationhtest"]: ensure => file, mode => 755;
 }
diff --git a/examples/code/snippets/multipleinstances b/examples/code/snippets/multipleinstances
index abc060316..2f9b3c2e8 100644
--- a/examples/code/snippets/multipleinstances
+++ b/examples/code/snippets/multipleinstances
@@ -1,7 +1,7 @@
 # $Id$
 
 file {
-    "/tmp/multipleinstancesa": create => true, mode => 755;
-    "/tmp/multipleinstancesb": create => true, mode => 755;
-    "/tmp/multipleinstancesc": create => true, mode => 755;
+    "/tmp/multipleinstancesa": ensure => file, mode => 755;
+    "/tmp/multipleinstancesb": ensure => file, mode => 755;
+    "/tmp/multipleinstancesc": ensure => file, mode => 755;
 }
diff --git a/examples/code/snippets/namevartest b/examples/code/snippets/namevartest
index 93a263dd4..b4db5bacf 100644
--- a/examples/code/snippets/namevartest
+++ b/examples/code/snippets/namevartest
@@ -1,9 +1,9 @@
-define filetest(mode, create = true) {
+define filetest(mode, ensure = file) {
     file { $name:
         mode => $mode,
-        create => $create
+        ensure => $ensure
     }
 }
 
 filetest { "/tmp/testfiletest": mode => 644}
-filetest { "/tmp/testdirtest": mode => 755, create => directory}
+filetest { "/tmp/testdirtest": mode => 755, ensure => directory}
diff --git a/examples/code/snippets/scopetest b/examples/code/snippets/scopetest
index b00560372..3d3b31d8a 100644
--- a/examples/code/snippets/scopetest
+++ b/examples/code/snippets/scopetest
@@ -2,7 +2,7 @@
 $mode = 640
 
 define thing {
-    file { "/tmp/scopetest": create => true, mode => $mode }
+    file { "/tmp/scopetest": ensure => file, mode => $mode }
 }
 
 class testing {
diff --git a/examples/code/snippets/selectorvalues.pp b/examples/code/snippets/selectorvalues.pp
index e4d1ce444..dcbf16c70 100644
--- a/examples/code/snippets/selectorvalues.pp
+++ b/examples/code/snippets/selectorvalues.pp
@@ -17,6 +17,6 @@ $mode3 = $value3 ? {
     default => 644
 }
 
-file { "/tmp/selectorvalues1": create => true, mode => $mode1 }
-file { "/tmp/selectorvalues2": create => true, mode => $mode2 }
-file { "/tmp/selectorvalues3": create => true, mode => $mode3 }
+file { "/tmp/selectorvalues1": ensure => file, mode => $mode1 }
+file { "/tmp/selectorvalues2": ensure => file, mode => $mode2 }
+file { "/tmp/selectorvalues3": ensure => file, mode => $mode3 }
diff --git a/examples/code/snippets/simpledefaults b/examples/code/snippets/simpledefaults
index a8f6190b1..63d199a68 100644
--- a/examples/code/snippets/simpledefaults
+++ b/examples/code/snippets/simpledefaults
@@ -2,4 +2,4 @@
 
 File { mode => 755 }
 
-file { "/tmp/defaulttest": create => true }
+file { "/tmp/defaulttest": ensure => file }
diff --git a/examples/code/snippets/simpleselector b/examples/code/snippets/simpleselector
index 52a06c773..8b9bc7292 100644
--- a/examples/code/snippets/simpleselector
+++ b/examples/code/snippets/simpleselector
@@ -3,7 +3,7 @@
 $var = "value"
 
 file { "/tmp/snippetselectatest":
-    create => true,
+    ensure => file,
     mode => $var ? {
         nottrue => 641,
         value => 755
@@ -11,7 +11,7 @@ file { "/tmp/snippetselectatest":
 }
 
 file { "/tmp/snippetselectbtest":
-    create => true,
+    ensure => file,
     mode => $var ? {
         nottrue => 644,
         default => 755
@@ -21,7 +21,7 @@ file { "/tmp/snippetselectbtest":
 $othervar = "complex value"
 
 file { "/tmp/snippetselectctest":
-    create => true,
+    ensure => file,
     mode => $othervar ? {
         "complex value" => 755,
         default => 644
@@ -30,7 +30,7 @@ file { "/tmp/snippetselectctest":
 $anothervar = Yayness
 
 file { "/tmp/snippetselectdtest":
-    create => true,
+    ensure => file,
     mode => $anothervar ? {
         Yayness => 755,
         default => 644
-- 
cgit