From 297f406c97262254d408e94e8a6baa44c2245a8b Mon Sep 17 00:00:00 2001
From: Ryan McCue <me@ryanmccue.info>
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 26405a0d9476938fbcd49a129c93f7497e1b9b9b Mon Sep 17 00:00:00 2001
From: Bronson Quick <bronson@bronsonquick.com.au>
Date: Fri, 9 Feb 2018 18:28:26 +1000
Subject: [PATCH 2/2] wp core multisite-install will look after the conversions
 for us and we don't need to use wp core multisite-convert after all

---
 manifests/site.pp | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 102aba3..45a06b3 100755
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,35 +14,34 @@
 
 	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'"
+		$install     = "install --url='$url'"
+		$new_install = true
 	}
 
-	if ( $network ) {
-		exec {"wp multisite-convert $location":
-			command => "/usr/bin/wp core $convert",
-			cwd => $location,
-			logoutput => true,
-			user => $::wp::user,
+	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'] ],
-			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,
-		user => $user,
-		require => [ Class['wp::cli'] ],
-		unless => '/usr/bin/wp core is-installed'
 	}
 
 	if $siteurl != $url {