Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add child domain support #132

Closed
wants to merge 76 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
806712b
resource cleanup
derekgroh Mar 4, 2021
bd4e97a
server 2008 removal
derekgroh Mar 4, 2021
3832a19
switch to gitflows
derekgroh Mar 4, 2021
7a79153
mdlinks add documentation folder
derekgroh Mar 4, 2021
225edcf
remove 2008 spec
derekgroh Mar 4, 2021
ff1c611
yamllint
derekgroh Mar 4, 2021
a387e41
update root files
derekgroh Mar 4, 2021
34cb9d3
remove duplicate action
derekgroh Mar 4, 2021
96e36de
markdown lint
derekgroh Mar 4, 2021
58903ee
refactor deprication logic
derekgroh Mar 4, 2021
f73f6af
gitactions reboot testing
derekgroh Mar 4, 2021
cb6aeef
fix resource logic
derekgroh Mar 5, 2021
c4c70a4
test differences in branch
derekgroh Mar 5, 2021
f829403
increase timeout to find success case
derekgroh Mar 8, 2021
051362a
Add child domain support
julien-lebot Jun 30, 2021
5a6c2c0
sync with sous-chefs
derekgroh Jun 30, 2021
7a6ca69
switch to windows_ad_join
derekgroh Jun 30, 2021
6f5f374
add develop branch
derekgroh Jun 30, 2021
3317b01
Merge branch 'develop'
derekgroh Jun 30, 2021
0d826ca
typo
derekgroh Jun 30, 2021
b821e15
create contributing.md
derekgroh Jun 30, 2021
ba3899f
unified_mode true
derekgroh Jun 30, 2021
817ed04
switch to main branch, test tmate
derekgroh Jun 30, 2021
7c73640
remove trailing spaces
derekgroh Jun 30, 2021
0cb0bc8
move tmate before kitchen exec
derekgroh Jun 30, 2021
4c734de
wait_for_retry 500
Jul 1, 2021
b5f8b10
disable tmate
Jul 1, 2021
55968eb
add reboot test
Jul 2, 2021
f9346bf
lint
Jul 2, 2021
9aec3fa
remove retry logic from default suite
Jul 4, 2021
42a2f19
add guard for reboot resource
Jul 4, 2021
15c63a7
restore ou resource
Jul 4, 2021
79b68d9
remove reboot recipe
Jul 4, 2021
06d0520
Revert "remove reboot recipe"
Jul 4, 2021
0f05ec9
Revert "remove retry logic from default suite"
Jul 4, 2021
9c4824d
objects
Jul 4, 2021
3d37ee2
add reboot guard
Jul 5, 2021
a78aada
increase transport sleep 300
Jul 5, 2021
835ae5f
change guard
Jul 5, 2021
d8a22a8
resource - restart true
Jul 5, 2021
5baaca0
resource false
Jul 5, 2021
bb371b0
reboot - 2nd file
Jul 5, 2021
4d70c80
yamllint
Jul 5, 2021
85b0f5a
increase timeout and retry count
Jul 5, 2021
13b3a43
lower reboot timer to 1
Jul 5, 2021
c9815a3
debug logging
Jul 5, 2021
b3c5094
unified mode
derekgroh Aug 30, 2021
4fed28c
use windows_feature_dism
derekgroh Aug 30, 2021
8c6f693
reboot testing no supported on github actions
derekgroh Aug 30, 2021
e3d2073
use chefworkstation
derekgroh Aug 30, 2021
e006f15
yamllint
derekgroh Aug 30, 2021
e02cc5e
typo
derekgroh Aug 30, 2021
6d12dd4
chef.exe
derekgroh Aug 30, 2021
265e5be
remove build script
derekgroh Aug 31, 2021
dfb693f
Revert "remove build script"
derekgroh Aug 31, 2021
4fec461
Merge remote-tracking branch 'origin/main' into main
derekgroh Aug 31, 2021
181e88f
appveyor updates
derekgroh Sep 4, 2021
447188f
exe instead of bat
derekgroh Sep 4, 2021
0f1687b
chef-workstation instead of chefdk
derekgroh Sep 4, 2021
0aef2bb
windows server 2012r2
derekgroh Sep 4, 2021
2d65353
simple build script
derekgroh Sep 4, 2021
f61557a
add chef-workstation to path
derekgroh Sep 4, 2021
3d12933
use kitchen.appveyor.yml
derekgroh Sep 4, 2021
2f4b3df
debug - file does not exist
derekgroh Sep 4, 2021
6b5a036
rename file
derekgroh Sep 4, 2021
1289dea
single test
derekgroh Sep 4, 2021
c528b9b
log level - debug
derekgroh Sep 4, 2021
833ff5e
add images
derekgroh Sep 10, 2021
7140ddb
winrm elevated
derekgroh Sep 10, 2021
a09833a
refining tests
derekgroh Sep 10, 2021
fc571d5
add transport username,password
derekgroh Sep 10, 2021
b17e91f
winrm elevated
derekgroh Sep 10, 2021
cfb8581
restore full build_script command
derekgroh Sep 10, 2021
a480954
add forest suite
derekgroh Sep 11, 2021
70cd993
increase retry sleep to 300
derekgroh Sep 11, 2021
27ed371
Merge branch 'main' into patch-2
derekgroh Sep 12, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,53 @@
---
version: "build-{build}"

os: Windows Server 2012 R2
platform:
- x64
#os: Windows Server 2012 R2
#platform:
# - x64

environment:
machine_user: vagrant
machine_pass: vagrant
machine_port: 5985
KITCHEN_YAML: .kitchen.appveyor.yml
KITCHEN_YAML: kitchen.appveyor.yml
CHEF_LICENSE: accept

branches:
only:
- master
- main

# Do not build on tags (GitHub only)
skip_tags: true

#faster cloning
# faster cloning
clone_depth: 1

# Install the latest nightly of ChefDK
image:
- Visual Studio 2015
- Visual Studio 2017

platform:
- Any CPU

# Install the latest nightly of ChefWorkstation
install:
- ps: (& cmd /c); iex (irm https://omnitruck.chef.io/install.ps1); Install-Project -Project chefdk -channel current
- ps: (& cmd /c); iex (irm https://omnitruck.chef.io/install.ps1); Install-Project -Project chef-workstation -channel current
- ps: 'Get-CimInstance win32_operatingsystem -Property Caption, OSArchitecture, Version | fl Caption, OSArchitecture, Version'
- ps: $PSVersionTable
- ps: $env:CHEF_LICENSE="accept"
- c:\opscode\chefdk\bin\chef.bat exec ruby --version
- ps: secedit /export /cfg $env:temp/export.cfg
- ps: ((get-content $env:temp/export.cfg) -replace ('PasswordComplexity = 1', 'PasswordComplexity = 0')) | Out-File $env:temp/export.cfg
- ps: ((get-content $env:temp/export.cfg) -replace ('MinimumPasswordLength = 8', 'MinimumPasswordLength = 0')) | Out-File $env:temp/export.cfg
- ps: secedit /configure /db $env:windir/security/new.sdb /cfg $env:temp/export.cfg /areas SECURITYPOLICY
- ps: net user /add $env:machine_user $env:machine_pass
- ps: net localgroup administrators $env:machine_user /add
- ps: $env:Path += ";c:\opscode\chef-workstation\bin\"

build_script:
- ps: c:\opscode\chefdk\bin\chef.bat shell-init powershell | iex; cmd /c c:\opscode\chefdk\bin\chef.bat --version
- ps: c:\opscode\chef-workstation\bin\chef.exe shell-init powershell | iexe; cmd /c c:\opscode\chef-workstation\bin\chef.exe --version

test_script:
- c:\opscode\chefdk\bin\cookstyle --version
- c:\opscode\chefdk\bin\chef.bat exec foodcritic --version
- c:\opscode\chefdk\bin\chef.bat exec delivery local lint
- c:\opscode\chefdk\bin\chef.bat exec delivery local syntax
# - c:\opscode\chefdk\bin\chef.bat exec kitchen converge
# - c:\opscode\chefdk\bin\chef.bat exec kitchen verify

deploy: off
- c:\opscode\chef-workstation\bin\chef.exe exec delivery local all
- c:\opscode\chef-workstation\bin\chef.exe exec kitchen test --log-level debug

deploy: false
10 changes: 9 additions & 1 deletion .delivery/project.toml
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
remote_file = "https://raw.githubusercontent.com/chef-cookbooks/community_cookbook_tools/master/delivery/project.toml"
[local_phases]
unit = "rspec spec/"
lint = 'cookstyle --display-cop-names --extra-details'
syntax = "echo skipping"
provision = "echo skipping"
deploy = "echo skipping"
smoke = "echo skipping"
functional = "echo skipping"
cleanup = "echo skipping"
19 changes: 19 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# https://EditorConfig.org

# top-most EditorConfig file
root=true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# 2 space indentation
indent_style = space
indent_size = 2

# Avoid issues parsing cookbook files later
charset = utf-8

# Avoid cookstyle warnings
trim_trailing_whitespace = true
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use chefworkstation
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
89 changes: 89 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
---
name: ci

"on":
pull_request:
push:
branches:
- main

jobs:
delivery:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Run Chef Delivery
uses: actionshub/chef-delivery@main
env:
CHEF_LICENSE: accept-no-persist

yamllint:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Run yaml Lint
uses: actionshub/yamllint@main

mdl:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Run Markdown Lint
uses: actionshub/markdownlint@main

integration-windows-2016:
needs: [mdl, yamllint, delivery]
runs-on: windows-2016
strategy:
matrix:
os:
- 'windows-2016'
suite:
- 'default'
fail-fast: false

steps:
- name: Check out code
uses: actions/checkout@v2
- name: Install Chef
uses: actionshub/chef-install@main
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
- name: Kitchen Exec
uses: actionshub/test-kitchen@main
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml
with:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}

integration-windows-2019:
needs: [mdl, yamllint, delivery]
runs-on: windows-2019
strategy:
matrix:
os:
- 'windows-2019'
suite:
- 'default'
fail-fast: false

steps:
- name: Check out code
uses: actions/checkout@v2
- name: Install Chef
uses: actionshub/chef-install@main
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
- name: Kitchen Exec
uses: actionshub/test-kitchen@main
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml
with:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}
16 changes: 0 additions & 16 deletions .github/workflows/delivery.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/md-links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: md-links

"on":
pull_request:
push:
branches: [main]

jobs:
md-links:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
- name: markdown-link-check
uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-verbose-mode: "yes"
folder-path: "documentation"
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
*.rbc
.config
coverage
InstalledFiles
lib/bundler/man
pkg
rdoc
spec/reports
test/tmp
test/version_tmp
tmp
Expand All @@ -14,27 +10,32 @@ _Store
*#
.#*
\#*#
.*.sw[a-z]
*.un~
*.tmp
*.bk
*.bkup

# ruby/bundler files
# editor files
.idea
.*.sw[a-z]

# ruby/bundler/rspec files
.ruby-version
.ruby-gemset
.rvmrc
Gemfile.lock
.bundle
*.gem
coverage
spec/reports

# YARD artifacts
# YARD / rdoc artifacts
.yardoc
_yardoc
doc/
.idea
rdoc

# chef stuff
# chef infra stuff
Berksfile.lock
.kitchen
kitchen.local.yml
Expand All @@ -46,4 +47,3 @@ Policyfile.lock.json
# vagrant stuff
.vagrant/
.vagrant.d/
.kitchen/
69 changes: 0 additions & 69 deletions .kitchen.appveyor.yml

This file was deleted.

1 change: 1 addition & 0 deletions .mdlrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rules "~MD013", "~MD024", "~MD025", "~MD033"
20 changes: 20 additions & 0 deletions .overcommit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
PreCommit:
TrailingWhitespace:
enabled: true
YamlLint:
enabled: true
Rspec:
enabled: true
required_executable: 'rspec'
Cookstyle:
enabled: true
required_executable: 'cookstyle'
command: ["cookstyle"]
Delivery:
enabled: true
required_executable: 'delivery'
flags: ['local', 'all']
CommitMsg:
HardTabs:
enabled: true
Loading