Unverified Commit 1867c3da authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Revert policies for Windows 7 and 2008 R2 (#510)

parent b4f25ab6

assets/win2008r2-eval.xml

+11 −7
Original line number Diff line number Diff line
@@ -173,6 +173,15 @@ 
    <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <UserAuthentication>0</UserAuthentication>

    </component>

    <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <FirewallGroups>

        <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">

          <Active>true</Active>

          <Group>Remote Desktop</Group>

          <Profile>all</Profile>

        </FirewallGroup>

      </FirewallGroups>

    </component>

  </settings>

  <settings pass="oobeSystem">

    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -284,21 +293,16 @@ 
        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>15</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "NetDIS.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="Network Discovery" new enable=Yes</CommandLine>

          <Description>Enable Network Discovery</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>16</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "FPS-.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=Yes</CommandLine>

          <Description>Enable File Sharing</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>17</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "RemoteDesktop-[^I].*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <Description>Add RDP in firewall</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>18</Order>

          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>

          <Description>Execute custom script from the OEM folder if exists</Description>

        </SynchronousCommand>

assets/win2008r2.xml

+11 −7
Original line number Diff line number Diff line
@@ -176,6 +176,15 @@ 
    <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <UserAuthentication>0</UserAuthentication>

    </component>

    <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <FirewallGroups>

        <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">

          <Active>true</Active>

          <Group>Remote Desktop</Group>

          <Profile>all</Profile>

        </FirewallGroup>

      </FirewallGroups>

    </component>

  </settings>

  <settings pass="oobeSystem">

    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -287,21 +296,16 @@ 
        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>15</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "NetDIS.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="Network Discovery" new enable=Yes</CommandLine>

          <Description>Enable Network Discovery</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>16</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "FPS-.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=Yes</CommandLine>

          <Description>Enable File Sharing</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>17</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "RemoteDesktop-[^I].*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <Description>Add RDP in firewall</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>18</Order>

          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>

          <Description>Execute custom script from the OEM folder if exists</Description>

        </SynchronousCommand>

assets/win7x64-enterprise.xml

+11 −7
Original line number Diff line number Diff line
@@ -177,6 +177,15 @@ 
    <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <UserAuthentication>0</UserAuthentication>

    </component>

    <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <FirewallGroups>

        <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">

          <Active>true</Active>

          <Group>Remote Desktop</Group>

          <Profile>all</Profile>

        </FirewallGroup>

      </FirewallGroups>

    </component>

  </settings>

  <settings pass="oobeSystem">

    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -288,21 +297,16 @@ 
        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>15</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "NetDIS.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="Network Discovery" new enable=Yes</CommandLine>

          <Description>Enable Network Discovery</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>16</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "FPS-.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=Yes</CommandLine>

          <Description>Enable File Sharing</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>17</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "RemoteDesktop-[^I].*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <Description>Add RDP in firewall</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>18</Order>

          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>

          <Description>Execute custom script from the OEM folder if exists</Description>

        </SynchronousCommand>

assets/win7x64-ultimate.xml

+11 −7
Original line number Diff line number Diff line
@@ -177,6 +177,15 @@ 
    <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <UserAuthentication>0</UserAuthentication>

    </component>

    <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <FirewallGroups>

        <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">

          <Active>true</Active>

          <Group>Remote Desktop</Group>

          <Profile>all</Profile>

        </FirewallGroup>

      </FirewallGroups>

    </component>

  </settings>

  <settings pass="oobeSystem">

    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -288,21 +297,16 @@ 
        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>15</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "NetDIS.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="Network Discovery" new enable=Yes</CommandLine>

          <Description>Enable Network Discovery</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>16</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "FPS-.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=Yes</CommandLine>

          <Description>Enable File Sharing</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>17</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "RemoteDesktop-[^I].*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <Description>Add RDP in firewall</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>18</Order>

          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>

          <Description>Execute custom script from the OEM folder if exists</Description>

        </SynchronousCommand>

assets/win7x64.xml

+11 −7
Original line number Diff line number Diff line
@@ -177,6 +177,15 @@ 
    <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <UserAuthentication>0</UserAuthentication>

    </component>

    <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <FirewallGroups>

        <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">

          <Active>true</Active>

          <Group>Remote Desktop</Group>

          <Profile>all</Profile>

        </FirewallGroup>

      </FirewallGroups>

    </component>

  </settings>

  <settings pass="oobeSystem">

    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -288,21 +297,16 @@ 
        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>15</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "NetDIS.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="Network Discovery" new enable=Yes</CommandLine>

          <Description>Enable Network Discovery</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>16</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "FPS-.*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <CommandLine>netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=Yes</CommandLine>

          <Description>Enable File Sharing</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>17</Order>

          <CommandLine>powershell -ExecutionPolicy ByPass -Command "Enable-NetFirewallRule -DisplayGroup @(Get-NetFirewallRule | Where-Object Name -Match "RemoteDesktop-[^I].*" | Select-Object DisplayGroup -Unique | % DisplayGroup)"</CommandLine>

          <Description>Add RDP in firewall</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>18</Order>

          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>

          <Description>Execute custom script from the OEM folder if exists</Description>

        </SynchronousCommand>