diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 22:03:53 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 22:03:53 +0300 |
| commit | d9ee02347e75e45e6bee9f924fc74da777386d60 (patch) | |
| tree | 5b0277d569138ad52f4427df93422ca34a5c9375 | |
| parent | b5078a792c3024465cfcf07073a56d043c843389 (diff) | |
| download | puppet-d9ee02347e75e45e6bee9f924fc74da777386d60.tar puppet-d9ee02347e75e45e6bee9f924fc74da777386d60.tar.gz puppet-d9ee02347e75e45e6bee9f924fc74da777386d60.tar.bz2 puppet-d9ee02347e75e45e6bee9f924fc74da777386d60.tar.xz puppet-d9ee02347e75e45e6bee9f924fc74da777386d60.zip | |
puppet parser validation fixes
| -rw-r--r-- | deployment/websites/manifests/www.pp | 2 | ||||
| -rw-r--r-- | modules/phpbb/manifests/locale_db.pp | 1 | ||||
| -rw-r--r-- | modules/postgresql/manifests/database.pp | 1 | ||||
| -rw-r--r-- | modules/postgresql/manifests/remote_database.pp | 1 | ||||
| -rw-r--r-- | modules/postgresql/manifests/remote_db_and_user.pp | 1 | ||||
| -rw-r--r-- | modules/postgresql/manifests/remote_user.pp | 1 | ||||
| -rw-r--r-- | modules/postgresql/manifests/tagged.pp | 1 | ||||
| -rw-r--r-- | modules/subversion/manifests/repository.pp | 6 |
8 files changed, 10 insertions, 4 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index 8d5443d8..a76b6739 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -29,7 +29,7 @@ class websites::www { require => Git::Snapshot[$vhostdir], } - apache::vhost::base { $vhost}: + apache::vhost::base { $vhost: content => template('websites/vhost_www.conf', 'websites/vhost_www_rewrite.conf'), location => $vhostdir, diff --git a/modules/phpbb/manifests/locale_db.pp b/modules/phpbb/manifests/locale_db.pp index 93046c47..70116962 100644 --- a/modules/phpbb/manifests/locale_db.pp +++ b/modules/phpbb/manifests/locale_db.pp @@ -1,3 +1,4 @@ +# FIXME: In puppet >3.0 word 'tag' is reserved, so it have to be renamed define phpbb::locale_db($tag = 'default', $user = $phpbb::base::user) { postgresql::database { $name: diff --git a/modules/postgresql/manifests/database.pp b/modules/postgresql/manifests/database.pp index 822dc5ee..8c3b8656 100644 --- a/modules/postgresql/manifests/database.pp +++ b/modules/postgresql/manifests/database.pp @@ -12,6 +12,7 @@ define postgresql::database($description = '', # this is fetched by the manifest asking the database creation, # once the db have been created # FIXME proper ordering ? + # FIXME In puppet >3.0 word 'tag' is reserved, so it have to berenamed @@postgresql::database_callback { $name: tag => $name, callback_notify => $callback_notify, diff --git a/modules/postgresql/manifests/remote_database.pp b/modules/postgresql/manifests/remote_database.pp index 19beb712..a9fb1a59 100644 --- a/modules/postgresql/manifests/remote_database.pp +++ b/modules/postgresql/manifests/remote_database.pp @@ -1,3 +1,4 @@ +# FIXME: In puppet >3.0 word 'tag' is reserved, so it have to berenamed define postgresql::remote_database($description = '', $user = 'postgresql', $callback_notify = '', diff --git a/modules/postgresql/manifests/remote_db_and_user.pp b/modules/postgresql/manifests/remote_db_and_user.pp index bb331304..eedeaa17 100644 --- a/modules/postgresql/manifests/remote_db_and_user.pp +++ b/modules/postgresql/manifests/remote_db_and_user.pp @@ -1,3 +1,4 @@ +# FIXME: In puppet >3.0 word 'tag' is reserved, so it have to be renamed define postgresql::remote_db_and_user($password, $description = '', $tag = 'default', diff --git a/modules/postgresql/manifests/remote_user.pp b/modules/postgresql/manifests/remote_user.pp index ed2bf033..fb53df4c 100644 --- a/modules/postgresql/manifests/remote_user.pp +++ b/modules/postgresql/manifests/remote_user.pp @@ -1,3 +1,4 @@ +# FIXME: In puppet >3.0 word 'tag' is reserved, so it have to be renamed define postgresql::remote_user( $password, $tag = 'default') { @@postgresql::user { $name: diff --git a/modules/postgresql/manifests/tagged.pp b/modules/postgresql/manifests/tagged.pp index 56cdc033..6a49e3ff 100644 --- a/modules/postgresql/manifests/tagged.pp +++ b/modules/postgresql/manifests/tagged.pp @@ -1,3 +1,4 @@ +# FIXME: In puppet >3.0 word 'tag' is reserved, so it have to be renamed define postgresql::tagged() { # TODO add a system of tag so we can declare database on more than one # server diff --git a/modules/subversion/manifests/repository.pp b/modules/subversion/manifests/repository.pp index c5d8509b..8d6156b9 100644 --- a/modules/subversion/manifests/repository.pp +++ b/modules/subversion/manifests/repository.pp @@ -38,12 +38,12 @@ define subversion::repository($group = 'svn', } file { $name: - ensure => directory + ensure => directory, group => $group, owner => 'root', mode => $public ? { - true => 644, - false => 640, + true => '0644', + false => '0640', }, } |