Paging (indent)

Author: matt6697

manifests/databasehighavailability.pp

@@ -50,7 +50,7 @@
 			#require => Dsc_sqldatabaserecoverymodel['LoggingDatabaseRecoveryModel']
 		}
 
-    dsc_sqlagdatabase{'MonitorDatabaseAlwaysOn':
+		dsc_sqlagdatabase{'MonitorDatabaseAlwaysOn':
 			dsc_databasename => $monitordatabasename,
 			dsc_availabilitygroupname => $sqlavailabilitygroup,
 			dsc_servername => $databaseserver,

manifests/install.pp

@@ -1,28 +1,28 @@
 class xd7mastercontroller::install inherits xd7mastercontroller {
-  
+
 	reboot { 'after_run':
 	 apply => immediately,
 	 when => refreshed
-	} 
-	
+	}
+
 	dsc_xcredssp{ 'Server':
 	 dsc_ensure => 'Present',
 	 dsc_role => 'Server',
 	 notify => Reboot['after_run']
 	}
-	
+
 	dsc_xcredssp{ 'Client':
 	 dsc_ensure => 'Present',
 	 dsc_role => 'Client',
 	 dsc_delegatecomputers => '*'
 	}
-	
+
 	#Ensure IIS is not installed on the system to avoid conflicts with Broker Service
 	dsc_windowsfeature{'iis':
 	 dsc_ensure => 'Absent',
 	 dsc_name   => 'Web-Server',
 	}
-  
+
   #Install Delivery Controller
 	dsc_xd7features { 'XD7DeliveryController':
 	 dsc_issingleinstance => 'Yes',
@@ -32,20 +32,20 @@
 	 require => Dsc_windowsfeature['iis'],
 	 notify => Reboot['after_run']
 	}
-  
+
 	#Download and install SQLSERVER powershell module. Required for database high availability setup (always on citrix databases membership)
 	file{ "C:\\Program Files\\WindowsPowerShell\\Modules\\sqlserver_powershell_21.0.17199.zip":
 	 source => 'puppet:///modules/xd7mastercontroller/sqlserver_powershell_21.0.17199.zip',
 	 source_permissions => ignore,
 	}
-  
+
   #dsc_xarchive{'UnzipSqlserverModule':
 	#  dsc_path  => 'C:\Program Files\WindowsPowerShell\Modules\sqlserver_powershell_21.0.17199.zip',
 	#  dsc_destination => 'C:\Program Files\WindowsPowerShell\Modules',
 	#  dsc_force => true,
 	#  require => File["C:\\Program Files\\WindowsPowerShell\\Modules\\sqlserver_powershell_21.0.17199.zip"]
   #}
-  
+
 	#Unzip function provided by the reidmv-unzip
 	unzip{'UnzipSqlserverModule':
 	 source  => 'C:\\Program Files\WindowsPowerShell\Modules\sqlserver_powershell_21.0.17199.zip',

manifests/siteconfig.pp

@@ -1,5 +1,5 @@
 class xd7mastercontroller::siteconfig inherits xd7mastercontroller {
-   
+
 	#Databases creation
 	dsc_xd7database{ 'XD7SiteDatabase':
 	 dsc_sitename => $sitename,
@@ -9,7 +9,7 @@
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
 	 #require => Dsc_xd7features['XD7DeliveryController']
 	}
-	
+
 	dsc_xd7database{ 'XD7SiteLoggingDatabase':
 	 dsc_sitename => $sitename,
 	 dsc_databaseserver => $databaseserver,
@@ -18,17 +18,17 @@
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
 	 #require => Dsc_xd7features['XD7DeliveryController']
 	}
-	
+
 	dsc_xd7database{ 'XD7SiteMonitorDatabase':
 	 dsc_sitename => $sitename,
 	 dsc_databaseserver => $databaseserver,
 	 dsc_databasename => $monitordatabasename,
 	 dsc_datastore => 'Monitor',
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
-	 #require => Dsc_xd7features['XD7DeliveryController'] 
+	 #require => Dsc_xd7features['XD7DeliveryController']
 	}
-	
-	#XD7 site creation      
+
+	#XD7 site creation
 	dsc_xd7site{ 'XD7Site':
 	 dsc_sitename => $sitename,
 	 dsc_databaseserver => $databaseserver,
@@ -38,52 +38,52 @@
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
 	 require => [Dsc_xd7database['XD7SiteDatabase'], Dsc_xd7database['XD7SiteMonitorDatabase'], Dsc_xd7database['XD7SiteLoggingDatabase'] ]
 	}
-	
+
 	#Linking with Citrix License server
 	dsc_xd7sitelicense{ 'XD7SiteLicense':
 	 dsc_licenseserver => $licenceserver,
 	 dsc_licenseedition => 'PLT',
 	 dsc_licensemodel => 'UserDevice',
 	 dsc_trustlicenseservercertificate => false,
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
-	 require => Dsc_xd7site['XD7Site'] 
+	 require => Dsc_xd7site['XD7Site']
 	}
-	
+
   #Site admin roles for users
   #Administrator has to be created before beeing affected a role
 	dsc_xd7administrator{ 'CitrixAdmin':
 	 dsc_name => $xd7administrator,
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
-	 require => Dsc_xd7site['XD7Site'] 
+	 require => Dsc_xd7site['XD7Site']
 	}
-	
+
 	dsc_xd7role{ 'CitrixAdminFullAdministratorRole':
 	 dsc_name => 'Full Administrator',
 	 dsc_members => $xd7administrator,
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
 	 require => [ Dsc_xd7site['XD7Site'] , Dsc_xd7administrator['CitrixAdmin'] ]
-	}
-	
+  }
+
 	#Site admin roles for Puppet service account
 	#Administrator has to be created before beeing affected a role
 	dsc_xd7administrator{ 'PuppetServiceAccountCitrixAdmin':
 	 dsc_name => $svc_username,
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
-	 require => Dsc_xd7site['XD7Site'] 
+	 require => Dsc_xd7site['XD7Site']
 	}
-  
+
 	dsc_xd7role{ 'PuppetServiceAccountFullAdministratorRole':
 	 dsc_name => 'Full Administrator',
 	 dsc_members => $svc_username,
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
 	 require => [ Dsc_xd7site['XD7Site'] , Dsc_xd7administrator['PuppetServiceAccountCitrixAdmin'] ]
   }
-  
+
 	#Trust requests sent to XML service
 	dsc_xd7siteconfig{'XD7GlobalSiteSetting':
 	 dsc_issingleinstance => 'Yes',
 	 dsc_trustrequestssenttothexmlserviceport => true,
 	 dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
 	 require => Dsc_xd7site['XD7Site']
 	}
-}
+}

manifests/sslconfig.pp

@@ -1,48 +1,48 @@
 class xd7mastercontroller::sslconfig inherits xd7mastercontroller {
   if $https {
-		reboot { 'after_sslconfig':
-		  apply => finished,
-		  when => refreshed
-		} 
+    reboot { 'after_sslconfig':
+      apply => finished,
+      when => refreshed
+    }
+
+    #Download SSL certificate
+    dsc_file{ 'SSLCert':
+      dsc_sourcepath => $sslCertificateSourcePath,
+      dsc_destinationpath => 'c:\SSL\cert.pfx',
+      dsc_type => 'File'
+    }->
 
-		#Download SSL certificate
-		dsc_file{ 'SSLCert':
-		  dsc_sourcepath => $sslCertificateSourcePath,
-		  dsc_destinationpath => 'c:\SSL\cert.pfx',
-		  dsc_type => 'File'
-		}->
+    #Load SSL certificate in Local Computer personal certificate store
+    dsc_xpfximport{ 'ImportSSLCert':
+      dsc_thumbprint => $sslCertificateThumbprint,
+      dsc_path => 'c:\SSL\cert.pfx',
+      dsc_location => 'LocalMachine',
+      dsc_store => 'My',
+      dsc_credential => {'user' => 'cert', 'password' => $sslCertificatePassword },
+      require => Dsc_file['SSLCert']
+    }->
 
-		#Load SSL certificate in Local Computer personal certificate store
-		dsc_xpfximport{ 'ImportSSLCert':
-		  dsc_thumbprint => $sslCertificateThumbprint,
-		  dsc_path => 'c:\SSL\cert.pfx',
-		  dsc_location => 'LocalMachine',
-		  dsc_store => 'My',
-		  dsc_credential => {'user' => 'cert', 'password' => $sslCertificatePassword },
-		  require => Dsc_file['SSLCert']
-		}->
+    #Map SSL certificate to Citrix Broker Service using netsh method
+    #netsh http add sslcert ipport=0.0.0.0:443 certhash=<Certificate Hash Number> appid={<Citrix Broker Service GUID>}
+    dsc_script{ 'CitrixBrokerServiceSSL':
+      dsc_getscript => 'Return @{ Result = [string]$(netsh http show sslcert) }',
+      dsc_testscript => 'If ((netsh http show sslcert | Select-String  "Application ID") -like "*Application*") {
+              Return $true
+            } Else {
+               Return $false
+            }',
+      dsc_setscript => "\$brokerservice = get-wmiobject -class Win32_Product | Where-Object {\$_.name -Like \"*Broker Service*\"}
+          \$guid = \$brokerservice.IdentifyingNumber
+          netsh http add sslcert ipport=0.0.0.0:443 certhash=${$sslCertificateThumbprint} appid=\$guid",
+      notify => Reboot['after_sslconfig']
+    }
 
-		#Map SSL certificate to Citrix Broker Service using netsh method
-		#netsh http add sslcert ipport=0.0.0.0:443 certhash=<Certificate Hash Number> appid={<Citrix Broker Service GUID>}
-		dsc_script{ 'CitrixBrokerServiceSSL':
-		  dsc_getscript => 'Return @{ Result = [string]$(netsh http show sslcert) }',
-		  dsc_testscript => 'If ((netsh http show sslcert | Select-String  "Application ID") -like "*Application*") {
-                  Return $true
-                } Else {
-                   Return $false
-                }',
-			dsc_setscript => "\$brokerservice = get-wmiobject -class Win32_Product | Where-Object {\$_.name -Like \"*Broker Service*\"}
-			   \$guid = \$brokerservice.IdentifyingNumber
-			   netsh http add sslcert ipport=0.0.0.0:443 certhash=${$sslCertificateThumbprint} appid=\$guid",
-			notify => Reboot['after_sslconfig']
+    #Make sure Citrix XML Service SSL port is 443
+    registry_value { 'HKLM\SOFTWARE\Citrix\DesktopServer\XmlServicesSslPort':
+      ensure => present,
+      type   => 'dword',
+      data   => '443',
+      require => Dsc_xd7features ['XD7DeliveryController']
     }
-  
-		#Make sure Citrix XML Service SSL port is 443
-		registry_value { 'HKLM\SOFTWARE\Citrix\DesktopServer\XmlServicesSslPort':
-		  ensure => present,
-		  type   => 'dword',
-		  data   => '443',
-		  require => Dsc_xd7features ['XD7DeliveryController']
-		}
-  }   
+  }
 }