diff --git a/manifests/site.pp b/manifests/site.pp index 1a8f3cd..45a06b3 100755 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -19,15 +19,29 @@ $install = "multisite-install --url='$url'" } else { - $install = "install --url='$url'" + $install = "install --url='$url'" + $new_install = true } - exec {"wp install $location": - command => "/usr/bin/wp core $install --title='$sitename' --admin_email='$admin_email' --admin_name='$admin_user' --admin_password='$admin_password'", - cwd => $location, - user => $user, - require => [ Class['wp::cli'] ], - unless => '/usr/bin/wp core is-installed' + if ( $new_install == true ) { + exec { "wp install $location": + command => "/usr/bin/wp core $install --title='$sitename + ' --admin_email='$admin_email' --admin_name='$admin_user + ' --admin_password='$admin_password'", + cwd => $location, + user => $user, + require => [ Class['wp::cli'] ], + unless => '/usr/bin/wp core is-installed' + } + } else { + exec { "wp install $location": + command => "/usr/bin/wp core $install --title='$sitename + ' --admin_email='$admin_email' --admin_name='$admin_user + ' --admin_password='$admin_password'", + cwd => $location, + user => $user, + require => [ Class['wp::cli'] ], + } } if $siteurl != $url {