Merge branch 'master' into testing

UltiSnips/puppet.snippets

@@ -8,43 +8,39 @@ endsnippet
 
 snippet File "Defaults for file" b
 File {
-    owner => '${1:username}',
+  owner => ${1:username},
-    group => '${2:groupname}',
+  group => ${2:groupname},
 }
 endsnippet
 
 # Resource types
 snippet package "Package resource type" b
-package { "${1:name}":
+package { '${1:name}':
-    ensure => '${2:installed}',
+  ensure => ${2:installed},
 }
 endsnippet
 
 snippet file "File resource type" b
 file { '${1:name}':
-    source => 'puppet://${2:path}',
+  source => "puppet://${2:path}",
-    mode   => '${3:mode}',
+  mode   => ${3:mode},
-}
 endsnippet
 
 snippet group "Group resource type" b
 group { '${1:groupname}':
-    ensure => '${3:present}',
+  ensure => ${3:present},
-    gid    => '${2:gid}',
+  gid    => ${2:gid},
-}
 endsnippet
 
 snippet user "user resource type" b
-user { '${1:username}':
+group { '${1:username}':
-    ensure     => '${2:present}',
+  ensure     => ${2:present},
-    uid        => '${3:uid}',
+  uid        => ${3:uid},
-    gid        => '${4:gid}',
+  gid        => ${4:gid},
-    comment    => '${5:gecos}',
+  comment    => ${5:gecos},
-    home       => '${6:homedirectory}',
+  home       => ${6:homedirectory},
-    homeagain       => '$6',
   managehome => false,
-    require    => Group['${7:group}'],
+  require    => Group['${7:group'],
-}
 endsnippet
 
 snippet exec "Exec resource type" b
@@ -55,10 +51,10 @@ endsnippet
 
 snippet cron "Cron resource type" b
 cron { '${1:name}':
-    user    => '${2:user}',
+  user    => ${2:user},
   command => '${3:command}',
-    minute  => '${3:minute}',
+  minute  => ${3:minute},
-    hour    => '${4:hour}',
+  hour    => ${4:hour},
 }
 endsnippet
 
@@ -66,7 +62,7 @@ snippet mount "Mount resource type" b
 mount { '${1:path}':
   device  => '${2:/dev}',
   fstype  => '${3:filesystem}',
-    ensure  => 'mounted',
+  ensure  => mounted,
   options => 'rw,errors=remount-ro',
 }
 endsnippet
@@ -75,7 +71,7 @@ snippet service "Service resource type" b
 service { '${1:name}':
   hasstatus => true,
   enable    => true,
-    ensure    => 'running',
+  ensure    => running,
 }
 endsnippet
 

doc/UltiSnips.txt

@@ -1364,6 +1364,8 @@ Contributors listed in chronological order:
    Matthew Strawbridge (pxc)
    Josh Strater (jstrater)
    jinzhu
+   Rene Vergara (ravl1084)
+   Johan Haals (JHaals)
 
 Thank you for your support.