Skip to content

Commit 23a9ba8

Browse files
authored
Merge pull request #3 from xoap-io/dev
feat: multiple adjustments to README.md and template
2 parents fa56426 + c280f8d commit 23a9ba8

23 files changed

+105
-122
lines changed

.gitattributes

100644100755
File mode changed.

.gitignore

100644100755
File mode changed.

.pre-commit-config.yaml

100644100755
Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,6 @@ repos:
3131
- id: no-commit-to-branch
3232
args:
3333
- -b main
34-
- repo: https://github.com/antonbabenko/pre-commit-terraform
35-
rev: v1.72.1
36-
hooks:
37-
- id: terraform_fmt
38-
- id: terraform_tflint
39-
- id: terraform_docs
40-
args:
41-
- --hook-config=--path-to-file=README.md
42-
- --hook-config=--add-to-existing-file=true
43-
- --hook-config=--create-file-if-not-exist=true
44-
- id: terraform_tfsec
45-
- id: terraform_validate
46-
- repo: https://github.com/Checkmarx/kics
47-
rev: v1.5.9
48-
hooks:
49-
- id: kics
5034
- repo: https://github.com/sirosen/check-jsonschema
5135
rev: 0.15.1
5236
hooks:

LICENSE

100644100755
File mode changed.

New-CompositeRessource.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ param (
2323
$globalPrefix = "XOAP"
2424
$curDirectory = Resolve-Path .\
2525
$templatePath = Join-Path $curDirectory "templates"
26-
$rootModulePath = Resolve-Path ..\..\
26+
$rootModulePath = Resolve-Path ..\
2727
$Module = "${globalPrefix}${Module}DSC"
2828
$modulePath = Join-Path $rootModulePath "$Module"
2929
$moduleVersionPath = Join-Path $modulePath $Version
@@ -65,7 +65,7 @@ else
6565
$template = Join-Path $templatePath "composite_resource"
6666
$moduleData = @{
6767
project_name = "${Ressource}"
68-
version = "1.0.0"
68+
version = "0.0.1"
6969
company = $Company
7070
TemplatePath = "$template"
7171
DestinationPath = "$ressourcePath"

Readme.md

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Getting started
22

3-
This scripts are used to easly create new dsc composite ressources.
3+
This scripts are used to easly create new XOAP PowerShell DSC composite resources.
44

55
## Prerequisites
66

@@ -13,25 +13,28 @@ Import-Module Plaster
1313

1414
## Creating new modules
1515

16-
Modules will be automatically created once you are creating a new composite ressource.
16+
Modules will be automatically created once you are creating a new composite resource.
1717

18-
## Creating new composite ressources
18+
## Creating new composite resources
1919

20-
Composite ressources can easily be deployed via the invocation of
20+
Composite resources can easily be deployed via the invocation of:
2121

2222
´´PowerShell
23-
.\New-CompositeRessource.ps1
24-
``
23+
.\New-CompositeResource.ps1
24+
``
2525

2626
with parameters
2727

2828
´´PowerShell
29-
.\New-CompositeRessource.ps1 -Module W2K19DC1903Baseline -Version 1.0.0 -Ressource ScheduledTasks
30-
``
29+
.\New-CompositeResource.ps1 -Module Template -Version 1.0.0 -Resource DSC_Template
30+
``
31+
32+
The prefix "XOAP" is automatically added and the postfix "DSC" as well.
33+
3134
The parameter list is as followed:
3235

33-
|Parameter |Description |Note
34-
| ------------- | ----------------------------------------- | ------------- |
35-
|Module |Name of the outer module part | -
36-
|Version |Target version of the module | -
37-
|Ressource |The name of the ressource /config part | -
36+
| Parameter | Description | Note |
37+
| --------- | ------------------------------------- | ---- |
38+
| Module | Name of the outer module part | - |
39+
| Version | Target version of the module | - |
40+
| Resource | The name of the resource /config part | - |

modules/XOAPBaselineW2k19DSC/0.1.0/DSCResources/ScheduledTasks/ScheduledTasks.psd1 renamed to module/XOAPTemplateDSC/0.0.1/DSCResources/DSC_Template/Template.psd1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Module manifest for module 'ScheduledTasks'
2+
# Module manifest for module 'Template'
33
#
44
# Generated by: XOAP
55
#
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Script module or binary module file associated with this manifest.
12-
RootModule = 'ScheduledTasks.schema.psm1'
12+
RootModule = 'Template.schema.psm1'
1313

1414
# Version number of this module.
1515
ModuleVersion = '1.0.0'
@@ -30,7 +30,7 @@ CompanyName = 'XOAP'
3030
Copyright = '(c) XOAP.io. All rights reserved.'
3131

3232
# Description of the functionality provided by this module
33-
Description = 'ScheduledTasks'
33+
Description = 'Template'
3434

3535
# Minimum version of the PowerShell engine required by this module
3636
# PowerShellVersion = ''
@@ -94,14 +94,14 @@ PrivateData = @{
9494

9595
PSData = @{
9696

97-
# Tags applied to this module. These help with module discovery in online galleries.
98-
# Tags = @()
97+
# Tags applied to this module. These help with module discovery in online galleries.
98+
Tags = @(DSC, XOAP)
9999

100100
# A URL to the license for this module.
101101
# LicenseUri = ''
102102

103103
# A URL to the main website for this project.
104-
# ProjectUri = ''
104+
ProjectUri = 'https://xoap.io'
105105

106106
# A URL to an icon representing this module.
107107
# IconUri = ''
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
configuration ScheduledTasks
1+
configuration Template
22
{
33
[CmdletBinding()]
44
param (
55
[Parameter()]
66
[TypeName]
77
$ParameterName
88
)
9+
Import-DSCResource -ModuleName xPSDesiredStateConfiguration
910

10-
#Import-DSCResource -ModuleName xPSDesiredStateConfiguration
11-
#
1211
#xRegistry disableInsecureCipher_a
1312
#{
1413
# Key = 'HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Ciphers\DES 56/56'
@@ -18,5 +17,4 @@ configuration ScheduledTasks
1817
# Ensure = 'Present'
1918
# Force = $true
2019
#}
21-
2220
}
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
configuration default
1+
configuration Template
22
{
33
param
44
(
55
# Target nodes to apply the configuration
66
[string[]]$NodeName = 'localhost'
77
)
88

9-
Import-Module XOAPBaselineW2k19DSC
10-
Import-DSCResource -ModuleName XOAPBaselineW2k19DSC
9+
Import-Module XOAPTemplateDSC
10+
Import-DSCResource -ModuleName XOAPTemplateDSC
1111

1212
Node $NodeName
1313
{
14-
15-
$moduleRoot = [io.path]::GetDirectoryName((Get-Module XOAPBaselineW2k19DSC).Path)
14+
$moduleRoot = [io.path]::GetDirectoryName((Get-Module XOAPTemplateDSC).Path)
1615
$examples = "$moduleRoot\Examples"
1716

1817
# Install the IIS role
@@ -21,6 +20,5 @@ configuration default
2120
Ensure = "Present"
2221
Name = "Web-Server"
2322
}
24-
2523
}
2624
}

0 commit comments

Comments
 (0)