vagrant-dsc 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8240a3495c72f76f0e6401942afde084014bc466
-  data.tar.gz: 3e8f36d14b7ef86b7e556435e8fd3d151f2e0b62
+  metadata.gz: a23d07bfdced212c1036b9e3d36092a018eecb6a
+  data.tar.gz: 382422fdff1951d30eda2baab87ce2e8d53364b5
 SHA512:
-  metadata.gz: 24fa42974fa2cbf15b6d3e170a4f66a7dcc5b45f405f55a4f693fd93c2c550495f5d9f793adcfbe8749ee88d2d609d4a7f3bfa300723a40cc93a2e717415acbe
-  data.tar.gz: e5a2da9736b7bdcd84d10ae2bb5d2a33db9654b34c8c0b256e18e3f46575563e1e6bd2989eda3e266cc967ef4eaed13fe6f4c0829f6799822a8c4a4db737e4f8
+  metadata.gz: f33aaf4511ccba1237e193f7e908fdd21a34a9e4d9277bb53b8ed004d3333235d2215995c9d9287660266034b8276198733525b73ff1d1becd848e21e477eb41
+  data.tar.gz: d0bb148d250e5917b3a23a89f76df674e15fa87622b90af2d7f5a9b41e15b47ca208c947c226e280a17a1fde17ae409822affc4d3a8fe863fe01532e8f3fac58

data/.gitignore

@@ -21,4 +21,5 @@ tmp
 *.a
 mkmf.log
 .vagrant
-.idea
+.idea
+.tags*

data/README.md

@@ -33,7 +33,7 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     # Set of Parameters to pass to the DSC Configuration.
     #
     # To pass in flags, simply set the value to `nil`
-    dsc.configuration_params = {"machineName" => "localhost", "-EnableDebug" => nil}
+    dsc.configuration_params = {"-MachineName" => "localhost", "-EnableDebug" => nil}
 
     # Relative path to a folder containing a pre-generated MOF file.
     #

data/development/Vagrantfile

@@ -1,6 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+$shell_script = <<SCRIPT
+  (iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')))>$null 2>&1
+  choco install seek-dsc
+  Get-DSCResource
+SCRIPT
+
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
@@ -17,13 +23,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
   config.vm.network :forwarded_port, guest: 80,   host: 8000, id: "web" # Port forward for IIS
-  config.vm.network :forwarded_port, guest: 8443, host: 443,  id: "ssl" # Port forward for SSL IIS
+  config.vm.network :forwarded_port, guest: 443, host: 8443,  id: "ssl" # Port forward for SSL IIS
+  config.vm.network :forwarded_port, guest: 22, host: 9222,  id: "ssh" # Port forward for SSL IIS
 
   config.vm.provider "virtualbox" do |v|
-    v.customize ["modifyvm", :id, "--vram", "128"]
     v.gui = true
   end
 
+  # Install Chocolatey and some basic DSC Resources
+  config.vm.provision "shell", inline: $shell_script
+
+  # Upload Website
+  config.vm.provision "file", source: "website", destination: "c:\\my-web-app"
+
+  # Run DSC
   config.vm.provision "dsc" do |dsc|
 
     # Set of module paths relative to the Vagrantfile dir.
@@ -64,6 +77,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     #dsc.synced_folder_type = ""
 
     # Temporary working directory on the guest machine.
-    #dsc.temp_dir = "/tmp/vagrant-dsc"
+    # dsc.temp_dir = "c:/tmp/vagrant-dsc"
   end
-end
+end

data/development/manifests/MyWebsite.ps1

@@ -1,17 +1,30 @@
-Configuration MyWebsite
-{
-  param ($MachineName)
-
-  Node $MachineName
-  {
-    #Install the IIS Role
-    File website
-    {
-      Ensure = "Present"
-      Type = "Directory"
-      DestinationPath = "c:\mywebroot"
-    }
-  }
-}
-
-Write-Output "Hello from DSC Provisioner: Config file"
+Configuration MyWebsite
+{
+  param ($MachineName)
+
+  Import-DscResource -Module cWebAdministration
+  Import-DscResource -Module MyWebapp
+
+  Node $MachineName
+  {
+    WindowsFeature IIS
+    {
+        Ensure = "Present"
+        Name = "Web-Server"
+    }
+    cWebsite DefaultWebsite
+    {
+        Name = "Default Web Site"
+        ApplicationPool = "DefaultAppPool"
+        PhysicalPath = "$env:SystemDrive\inetpub\wwwroot"
+        Ensure = "Absent"
+        DependsOn  = '[WindowsFeature]IIS'
+    }
+        
+    SimpleWebsite sWebsite
+    {
+        WebAppPath = "c:\my-new-webapp"
+        DependsOn  = '[cWebsite]DefaultWebsite'
+    }    
+  }
+}

data/development/modules/MyWebapp/DSCResources/SimpleWebsite/SimpleWebsite.schema.psm1

@@ -0,0 +1,44 @@
+Configuration SimpleWebsite
+{
+    param
+    (
+        [String]$WebAppPath = "c:\myWebApp",
+        [String]$WebAppName = "MyWebApp",
+        [HashTable]$AuthenticationInfo = @{Anonymous = "true"; Basic = "false"; Digest = "false"; Windows = "false"}
+    )
+
+    Import-DscResource -Module cWebAdministration
+
+    # Create the new Website    
+    cWebsite Basic
+    {
+        Ensure          = 'Present'
+        Name            = $WebAppName
+        PhysicalPath    = $WebAppPath
+        ApplicationPool = "DefaultAppPool"
+        AuthenticationInfo = SEEK_cWebAuthenticationInformation
+        {
+            Anonymous = $AuthenticationInfo.Anonymous
+            Basic = $AuthenticationInfo.Basic
+            Digest = $AuthenticationInfo.Digest
+            Windows = $AuthenticationInfo.Windows
+        }
+        DependsOn  = '[File]website'
+    }
+
+    File websiteIndex
+    {
+      Ensure = "Present"
+      Type = "File"
+      DestinationPath = "$WebAppPath\index.html"
+      SourcePath = "c:\vagrant\website\index.html"
+      DependsOn  = '[File]website'
+    }
+
+    File website
+    {
+      Ensure = "Present"
+      Type = "Directory"
+      DestinationPath = $WebAppPath
+    }
+}

data/development/website/index.html

@@ -0,0 +1 @@
+Hello from Vagrant DSC!

data/lib/vagrant-dsc/templates/runner.ps1.erb

@@ -8,8 +8,10 @@
 
 # Set the local PowerShell Module environment path
 <% if options[:module_paths]  %>
-echo "Adding to path: <%= options[:module_paths] %>"
-$env:PSModulePath="<%= options[:module_paths] %>;${env:PSModulePath}"
+$absoluteModulePaths = [string]::Join(";", ("<%= options[:module_paths] %>".Split(";") | ForEach-Object { $_ | Resolve-Path }))
+
+echo "Adding to path: $absoluteModulePaths"
+$env:PSModulePath="$absoluteModulePaths;${env:PSModulePath}"
 <% end %>
 
 $script = $(Join-Path "<%= options[:temp_path] %>" "<%= options[:configuration_file] %>")

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -256,8 +256,10 @@ describe VagrantPlugins::DSC::Provisioner do
 #
 
 # Set the local PowerShell Module environment path
-echo \"Adding to path: /tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\"
-$env:PSModulePath=\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1;${env:PSModulePath}\"
+$absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { $_ | Resolve-Path }))
+
+echo \"Adding to path: $absoluteModulePaths\"
+$env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\")
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
@@ -293,8 +295,10 @@ $response"
 #
 
 # Set the local PowerShell Module environment path
-echo \"Adding to path: /tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\"
-$env:PSModulePath=\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1;${env:PSModulePath}\"
+$absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { $_ | Resolve-Path }))
+
+echo \"Adding to path: $absoluteModulePaths\"
+$env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\")
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
@@ -328,8 +332,10 @@ $response"
 #
 
 # Set the local PowerShell Module environment path
-echo \"Adding to path: /tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\"
-$env:PSModulePath=\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1;${env:PSModulePath}\"
+$absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { $_ | Resolve-Path }))
+
+echo \"Adding to path: $absoluteModulePaths\"
+$env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\")
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
@@ -348,7 +354,7 @@ $response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&
 $response"
 
         expect(script).to eq(expect_script)
-      end      
+      end
     end
 
     context "with a MOF file specified" do
@@ -366,8 +372,10 @@ $response"
 #
 
 # Set the local PowerShell Module environment path
-echo \"Adding to path: /tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\"
-$env:PSModulePath=\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1;${env:PSModulePath}\"
+$absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { $_ | Resolve-Path }))
+
+echo \"Adding to path: $absoluteModulePaths\"
+$env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\")
 echo \"PSModulePath Configured: ${env:PSModulePath}\"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -166,6 +166,10 @@ files:
 - Rakefile
 - development/Vagrantfile
 - development/manifests/MyWebsite.ps1
+- development/modules/MyWebapp/DSCResources/SimpleWebsite/SimpleWebsite.psd1
+- development/modules/MyWebapp/DSCResources/SimpleWebsite/SimpleWebsite.schema.psm1
+- development/modules/MyWebapp/MyWebapp.psd1
+- development/website/index.html
 - lib/vagrant-dsc.rb
 - lib/vagrant-dsc/config.rb
 - lib/vagrant-dsc/locales/en.yml