Merge pull request #34 from AutomatedLab/develop

Latest changes on CA functions
AutomatedLab · Aug 24, 2018 · 052c3c3 · 052c3c3
2 parents 363a099 + 46617cf
commit 052c3c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/AutomatedLab.Common/NetworkHelper/Public/Test-Port.ps1 b/AutomatedLab.Common/NetworkHelper/Public/Test-Port.ps1
@@ -1,12 +1,11 @@
 function Test-Port
 {  
-    [cmdletbinding()]
-
+    [Cmdletbinding()]
     Param(  
-        [Parameter(Mandatory, Position = 0)]  
+        [Parameter(Mandatory, Position = 0, ValueFromPipeline, ValueFromPipelineByPropertyName)]
         [string[]]$ComputerName,
 
-        [Parameter(Mandatory, Position = 1)]
+        [Parameter(Mandatory, Position = 1, ValueFromPipelineByPropertyName)]
         [int]$Port,
 
         [int]$Count = 1,

diff --git a/AutomatedLab.Common/PkiHelper/Public/Publish-CaTemplate.ps1 b/AutomatedLab.Common/PkiHelper/Public/Publish-CaTemplate.ps1
@@ -1,25 +1,27 @@
-function Publish-CATemplate
+function Publish-CaTemplate
 {
     [cmdletBinding()]
     param(
         [Parameter(Mandatory = $true)]
         [string]$TemplateName
     )
 
-    $caInfo = certutil.exe -CAInfo
+    $ca = Find-CertificateAuthority
+    $caInfo = certutil.exe -CAInfo -Config $ca
     if ($caInfo -like '*No local Certification Authority*')
     {
-        Write-Error 'This command needs to run on a CA'
+        Write-Error 'No issuing CA found in the machines domain'
         return
     }
+    $computerName = $ca.Split('\')[0]
 
     $start = Get-Date
     $done = $false
     $i = 0
     do
     {
-        Write-Verbose -Message "Trying to publish '$TemplateName' at ($(Get-Date)), retry count $i"
-        $result = certutil.exe -SetCAtemplates "+$TemplateName" | Out-Null
+        Write-Verbose -Message "Trying to publish '$TemplateName' on '$ca' at ($(Get-Date)), retry count $i"
+        certutil.exe -Config $ca -SetCAtemplates "+$TemplateName" | Out-Null
         if (-not $LASTEXITCODE)
         {
             $done = $true
@@ -28,7 +30,7 @@ function Publish-CATemplate
         {
             if ($i % 5 -eq 0)
             {
-                Restart-Service -Name CertSvc
+                Get-Service -Name CertSvc -ComputerName $computerName | Restart-Service
             }
 
             $ex = New-Object System.ComponentModel.Win32Exception($LASTEXITCODE)