Skip to content

Commit 2b943ff

Browse files
matt6697matt6697
committed
Used dsc_xd7siteconfig for XML Service Trust instead of DSC script + paging
Used dsc_xd7siteconfig for XML Service Trust instead of DSC script + paging
1 parent 3a5ff10 commit 2b943ff

1 file changed

Lines changed: 62 additions & 73 deletions

File tree

‎manifests/siteconfig.pp‎

Lines changed: 62 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,89 @@
11
class xd7mastercontroller::siteconfig inherits xd7mastercontroller {
22

3-
#Databases creation
3+
#Databases creation
44
dsc_xd7database{ 'XD7SiteDatabase':
5-
dsc_sitename => $sitename,
6-
dsc_databaseserver => $databaseserver,
7-
dsc_databasename => $sitedatabasename,
8-
dsc_datastore => 'Site',
9-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
10-
#require => Dsc_xd7features['XD7DeliveryController']
5+
dsc_sitename => $sitename,
6+
dsc_databaseserver => $databaseserver,
7+
dsc_databasename => $sitedatabasename,
8+
dsc_datastore => 'Site',
9+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
10+
#require => Dsc_xd7features['XD7DeliveryController']
1111
}
1212

1313
dsc_xd7database{ 'XD7SiteLoggingDatabase':
14-
dsc_sitename => $sitename,
15-
dsc_databaseserver => $databaseserver,
16-
dsc_databasename => $loggingdatabasename,
17-
dsc_datastore => 'Logging',
18-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
19-
#require => Dsc_xd7features['XD7DeliveryController']
14+
dsc_sitename => $sitename,
15+
dsc_databaseserver => $databaseserver,
16+
dsc_databasename => $loggingdatabasename,
17+
dsc_datastore => 'Logging',
18+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
19+
#require => Dsc_xd7features['XD7DeliveryController']
2020
}
2121

2222
dsc_xd7database{ 'XD7SiteMonitorDatabase':
23-
dsc_sitename => $sitename,
24-
dsc_databaseserver => $databaseserver,
25-
dsc_databasename => $monitordatabasename,
26-
dsc_datastore => 'Monitor',
27-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
28-
#require => Dsc_xd7features['XD7DeliveryController']
23+
dsc_sitename => $sitename,
24+
dsc_databaseserver => $databaseserver,
25+
dsc_databasename => $monitordatabasename,
26+
dsc_datastore => 'Monitor',
27+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
28+
#require => Dsc_xd7features['XD7DeliveryController']
2929
}
3030

3131
#XD7 site creation
3232
dsc_xd7site{ 'XD7Site':
33-
dsc_sitename => $sitename,
34-
dsc_databaseserver => $databaseserver,
35-
dsc_sitedatabasename => $sitedatabasename,
36-
dsc_loggingdatabasename => $loggingdatabasename,
37-
dsc_monitordatabasename => $monitordatabasename,
38-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
39-
require => [Dsc_xd7database['XD7SiteDatabase'], Dsc_xd7database['XD7SiteMonitorDatabase'], Dsc_xd7database['XD7SiteLoggingDatabase'] ]
40-
}->
33+
dsc_sitename => $sitename,
34+
dsc_databaseserver => $databaseserver,
35+
dsc_sitedatabasename => $sitedatabasename,
36+
dsc_loggingdatabasename => $loggingdatabasename,
37+
dsc_monitordatabasename => $monitordatabasename,
38+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
39+
require => [Dsc_xd7database['XD7SiteDatabase'], Dsc_xd7database['XD7SiteMonitorDatabase'], Dsc_xd7database['XD7SiteLoggingDatabase'] ]
40+
}
4141

4242
#Linking with Citrix License server
4343
dsc_xd7sitelicense{ 'XD7SiteLicense':
44-
dsc_licenseserver => $licenceserver,
45-
dsc_licenseedition => 'PLT',
46-
dsc_licensemodel => 'UserDevice',
47-
dsc_trustlicenseservercertificate => false,
48-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
49-
require => Dsc_xd7site['XD7Site']
50-
}->
44+
dsc_licenseserver => $licenceserver,
45+
dsc_licenseedition => 'PLT',
46+
dsc_licensemodel => 'UserDevice',
47+
dsc_trustlicenseservercertificate => false,
48+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
49+
require => Dsc_xd7site['XD7Site']
50+
}
5151

52-
#Site admin roles for users
53-
#Administrator has to be created before beeing affected a role
52+
#Site admin roles for users
53+
#Administrator has to be created before beeing affected a role
5454
dsc_xd7administrator{ 'CitrixAdmin':
55-
dsc_name => $xd7administrator,
56-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
57-
require => Dsc_xd7site['XD7Site']
58-
}->
55+
dsc_name => $xd7administrator,
56+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
57+
require => Dsc_xd7site['XD7Site']
58+
}
5959

6060
dsc_xd7role{ 'CitrixAdminFullAdministratorRole':
61-
dsc_name => 'Full Administrator',
62-
dsc_members => $xd7administrator,
63-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
64-
require => [ Dsc_xd7site['XD7Site'] , Dsc_xd7administrator['CitrixAdmin'] ]
65-
}->
61+
dsc_name => 'Full Administrator',
62+
dsc_members => $xd7administrator,
63+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
64+
require => [ Dsc_xd7site['XD7Site'] , Dsc_xd7administrator['CitrixAdmin'] ]
65+
}
6666

6767
#Site admin roles for Puppet service account
6868
#Administrator has to be created before beeing affected a role
6969
dsc_xd7administrator{ 'PuppetServiceAccountCitrixAdmin':
70-
dsc_name => $svc_username,
71-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
72-
require => Dsc_xd7site['XD7Site']
73-
}->
74-
75-
dsc_xd7role{ 'PuppetServiceAccountFullAdministratorRole':
76-
dsc_name => 'Full Administrator',
77-
dsc_members => $svc_username,
78-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
79-
require => [ Dsc_xd7site['XD7Site'] , Dsc_xd7administrator['PuppetServiceAccountCitrixAdmin'] ]
80-
}->
70+
dsc_name => $svc_username,
71+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
72+
require => Dsc_xd7site['XD7Site']
73+
}
8174

82-
#Trust requests sent to XML service
83-
dsc_script{ 'TrustRequestsToXMLService':
84-
dsc_getscript => 'Add-PSSnapin -Name Citrix.Broker.Admin.V2 -ErrorAction SilentlyContinue
85-
$brokersite = Get-BrokerSite
86-
Return @{ Result = $brokersite.TrustRequestsSentToTheXmlServicePort) }',
87-
dsc_testscript => 'Add-PSSnapin -Name Citrix.Broker.Admin.V2 -ErrorAction SilentlyContinue
88-
$brokersite = Get-BrokerSite
89-
If ($brokersite.TrustRequestsSentToTheXmlServicePort) {
90-
Return $true
91-
} Else {
92-
Return $false
93-
}',
94-
dsc_setscript => 'Add-PSSnapin -Name Citrix.Broker.Admin.V2 -ErrorAction SilentlyContinue
95-
Set-BrokerSite -TrustRequestsSentToTheXmlServicePort $true',
96-
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
97-
require => Dsc_xd7site['XD7Site']
75+
dsc_xd7role{ 'PuppetServiceAccountFullAdministratorRole':
76+
dsc_name => 'Full Administrator',
77+
dsc_members => $svc_username,
78+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
79+
require => [ Dsc_xd7site['XD7Site'] , Dsc_xd7administrator['PuppetServiceAccountCitrixAdmin'] ]
9880
}
99-
81+
82+
#Trust requests sent to XML service
83+
dsc_xd7siteconfig{'XD7GlobalSiteSetting':
84+
dsc_issingleinstance => 'Yes',
85+
dsc_trustrequestssenttothexmlserviceport => true,
86+
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
87+
require => Dsc_xd7site['XD7Site']
88+
}
10089
}

0 commit comments

Comments
 (0)