Updating scripts/docs

Leo9IO · Aug 25, 2022 · 1a5e728 · 1a5e728
1 parent dc262ee
commit 1a5e728
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 59 deletions.
diff --git a/Earth-DC/New-DCAutomatedTask.ps1 b/Earth-DC/New-DCAutomatedTask.ps1
@@ -47,7 +47,7 @@ function New-DCAutomatedTask {
         )
         Add-Content $ProjectFilePath\Deploymentlog.txt "[*] Beginning of New-DCAutomatedTask...."
         Add-Content $ProjectFilePath\Deploymentlog.txt "[*] Createing ScheduledTask for Update-Domain..."
-        $action = New-ScheduledTaskAction -Execute 'powershell' -Argument "Import-Module $ProjectFilePath\Marvel-Lab.psm1; Update-Domain -UserCSVFilePath $UserCSVFilePath -WallpaperFilePath $WallpaperFilePath -GPOFilePath $GPOFilePath  -Automate 2>&1 | tee -filePath $ProjectFilePath\Earth-DC\deploymentlog.txt"
+        $action = New-ScheduledTaskAction -Execute 'powershell' -Argument "Import-Module $ProjectFilePath\Marvel-Lab.psm1; Update-Domain -UserCSVFilePath $UserCSVFilePath -WallpaperFilePath $WallpaperFilePath -GPOFilePath $GPOFilePath -ProjectFilePath $ProjectFilePath  -Automate 2>&1 | tee -filePath $ProjectFilePath\Earth-DC\deploymentlog.txt"
         $ScheduledTask = $ScheduledTask = Register-ScheduledTask -Action $action -User 'marvel\Administrator' -Password $Password -TaskName Update-Domain
         Start-ScheduledTask -TaskName Update-Domain
         Unregister-ScheduledTask -TaskName Initialize-MarvelDomain -Confirm:$false

diff --git a/Earth-DC/Rename-DC.ps1 b/Earth-DC/Rename-DC.ps1
@@ -51,10 +51,10 @@ function Rename-DC {
 
     Write-Output "[*] Renaming Host..."
 
-    Add-Content C:\WorkstationLog.txt "[*] Renaming Host..."
+    Add-Content $ProjectFilePath\Deploymentlog.txt "[*] Renaming Host..."
 
     if ($Automate){
-        Add-Content C:\WorkstationLog.txt "[*] Creating ScheduledTask for Initialize-MarvelDomain"
+        Add-Content $ProjectFilePath\Deploymentlog.txt "[*] Creating ScheduledTask for Initialize-MarvelDomain"
         $action = New-ScheduledTaskAction -Execute 'powershell' -Argument "Import-Module $ProjectFilePath\Marvel-Lab.psm1; Initialize-MarvelDomain -Automate -Password $Password 2>&1 | tee -filePath $ProjectFilePath\Earth-DC\deploymentlog.txt"
         $trigger = New-ScheduledTaskTrigger -AtLogOn
         $principal = New-ScheduledTaskPrincipal -UserID "NT AUTHORITY\SYSTEM" -LogonType ServiceAccount -RunLevel Highest

diff --git a/Earth-DC/Update-Domain.ps1 b/Earth-DC/Update-Domain.ps1
@@ -39,6 +39,9 @@ function Update-Domain {
         [string]
         $WallpaperFilePath = 'C:\Marvel-Lab\images\cap.jpg',
 
+        [string]
+        $ProjectFilePath = 'C:\Marvel-Lab',
+
         [string]
         $GPOFilePath = 'C:\Marvel-Lab\Earth-DC\GPOBackup',
 

diff --git a/docs/.vscode/settings.json b/docs/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "esbonio.sphinx.confDir": ""
+}
diff --git a/docs/index.rst b/docs/index.rst
@@ -2,60 +2,6 @@
 Marvel Lab
 ***********
 
-.. meta::
-   description lang=en: A collection of scripts that will help automate the build process for a Marvel domain.
+ :doc:`v1.0 <subpages/v1.0>`
 
-.. image:: /images/thor-rocket.gif
-   :align: center
-   :alt: thor-rocket
-
-Installation: 
--------------
-Go see - :doc:`Build Steps <subpages/build_steps>`. 
-
-Logging: 
---------
-This lab is meant to be used for research and detection development. The logging information for this lab is held within the - :doc:`Logging <subpages/logging>` page. If there is any other telemtry you would like to see, let us know! 
-
-Troubleshooting:
-----------------
-Before creating an issue within the Github, please check out the - :doc:`Troubleshooing <subpages/troubleshooting>` page. 
-
-Scripts: 
---------
-Many scripts are being used for this build, for explanations on these scripts please see - :doc:`Script Explanations <subpages/script_explanations>`. 
-
-
-Tools: 
-------
-Tools for red-teaming, blue-teaming, and debugging are installed. To see the full list, visit the - :doc:`Tools <subpages/tools>` page. If there is any other tools you'd like to see, let us know!
-
-Acknowledgements: 
--------
-
-- `Olaf Hartong`_'s Sysmon Modular `Config`_
-
-
-To Do: 
--------
-
-
-.. toctree::
-   :maxdepth: 2
-   :hidden:
-   :caption: Lab Info
-
-   subpages/build_steps
-   subpages/troubleshooting
-   subpages/script_explanations
-   subpages/tools
-
-.. toctree::
-   :maxdepth: 2
-   :hidden:
-   :caption: Logging information
-
-   subpages/logging
-
-.. _Config: https://github.com/olafhartong/sysmon-modular
-.. _Olaf Hartong: https://twitter.com/olafhartong
+ :doc:`v2.0 <subpages/v2.0>`
diff --git a/docs/subpages/v1.0.rst b/docs/subpages/v1.0.rst
@@ -0,0 +1,61 @@
+***********
+Marvel Lab
+***********
+
+.. meta::
+   description lang=en: A collection of scripts that will help automate the build process for a Marvel domain.
+
+.. image:: /images/thor-rocket.gif
+   :align: center
+   :alt: thor-rocket
+
+Installation: 
+-------------
+Go see - :doc:`Build Steps <subpages/build_steps>`. 
+
+Logging: 
+--------
+This lab is meant to be used for research and detection development. The logging information for this lab is held within the - :doc:`Logging <subpages/logging>` page. If there is any other telemtry you would like to see, let us know! 
+
+Troubleshooting:
+----------------
+Before creating an issue within the Github, please check out the - :doc:`Troubleshooing <subpages/troubleshooting>` page. 
+
+Scripts: 
+--------
+Many scripts are being used for this build, for explanations on these scripts please see - :doc:`Script Explanations <subpages/script_explanations>`. 
+
+
+Tools: 
+------
+Tools for red-teaming, blue-teaming, and debugging are installed. To see the full list, visit the - :doc:`Tools <subpages/tools>` page. If there is any other tools you'd like to see, let us know!
+
+Acknowledgements: 
+-------
+
+- `Olaf Hartong`_'s Sysmon Modular `Config`_
+
+
+To Do: 
+-------
+
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+   :caption: Lab Info
+
+   subpages/build_steps
+   subpages/troubleshooting
+   subpages/script_explanations
+   subpages/tools
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+   :caption: Logging information
+
+   subpages/logging
+
+.. _Config: https://github.com/olafhartong/sysmon-modular
+.. _Olaf Hartong: https://twitter.com/olafhartong
diff --git a/docs/subpages/v2.0.rst b/docs/subpages/v2.0.rst
@@ -0,0 +1,13 @@
+***********
+Marvel Lab
+***********
+
+.. meta::
+   description lang=en: A collection of scripts that will help automate the build process for a Marvel domain.
+
+.. image:: /images/thor-rocket.gif
+   :align: center
+   :alt: thor-rocket
+
+Installation: 
+-------------