From 297f406c97262254d408e94e8a6baa44c2245a8b Mon Sep 17 00:00:00 2001 From: Ryan McCue Date: Tue, 6 Dec 2016 14:07:59 +1000 Subject: [PATCH 1/2] Convert to network on provision --- manifests/site.pp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index fdf4e7f..bf07793 100755 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -13,14 +13,29 @@ if ( $network == true ) and ( $subdomains == true ) { $install = "multisite-install --subdomains --url='$url'" + $convert = "multisite-convert --subdomains --url='$url'" } elsif ( $network == true ) { $install = "multisite-install --url='$url'" + $convert = "multisite-convert --url='$url'" } else { $install = "install --url='$url'" } + if ( $network ) { + exec {"wp multisite-convert $location": + command => "/usr/bin/wp core $convert", + cwd => $location, + logoutput => true, + user => $::wp::user, + require => [ Class['wp::cli'] ], + before => [ Exec[ "wp install $location" ] ], + onlyif => '/usr/bin/wp core is-installed', + unless => '/usr/bin/wp core is-installed --network', + } + } + 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, From d398ecdaf203ef401310de28c4299b986a6ee73e Mon Sep 17 00:00:00 2001 From: Bronson Quick Date: Fri, 13 Sep 2019 16:33:10 +1000 Subject: [PATCH 2/2] Add user --- manifests/site.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index 1ca786c..b6253d7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2,6 +2,7 @@ define wp::site ( $aliases, $location, + $user = $::wp::user ) { include wp::cli @@ -23,7 +24,7 @@ if ( $slug ) { exec { "wp site create --slug=${slug}": cwd => $location, - user => $::wp::user, + user => $user, command => "/usr/bin/wp site create --slug=${slug}", unless => "/usr/bin/wp site list | grep $slug", require => Class['wp::cli'],