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

Multiple updates to docs and yml #965

Merged
merged 5 commits into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions ansible/Dockerfiles/example/variables.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
hostname: example
fqdn: example.echocity-f.com
ansible_host: 10.0.160.xx # The IP address for the target
DOCKER: localhost # Docker server to start the container
mac: de:ad:be:ef:c0:ff:ee # printf "02:42:%.2x:%.2x:%.2x:%.2x\n" 10 0 160 123
rootable: 1 # 0 for no
difficulty: 3 # 0-6
player_spin: 1 # allow player spins
Expand Down
3 changes: 3 additions & 0 deletions ansible/Dockerfiles/sanitycheck/variables.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
hostname: sanitycheck
fqdn: sanitycheck
ansible_host: 10.0.160.xx # The IP address for the target
DOCKER: localhost # Docker server to start the container
mac: de:ad:be:ef:c0:ff:ee # printf "02:42:%.2x:%.2x:%.2x:%.2x\n" 10 0 160 123
rootable: 0
difficulty: 0
timer: 0
Expand Down
5 changes: 3 additions & 2 deletions ansible/playbooks/feed-targets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
player_spin: "{{player_spin|default('1')}}"
headshot_spin: "{{headshot_spin|default('1')}}"
writeup_allowed: "{{writeup_allowed|default('1')}}"
description: '{{description}}'
instance_allowed: "{{instance_allowed|default('1')}}"
description: '{{description|default("")}}'
ipoctet: '{{ansible_host}}'
difficulty: "{{difficulty|default('0')}}"
mac: '{{mac}}'
Expand Down Expand Up @@ -116,7 +117,7 @@
# ignore_errors: true
tags:
- UI
when: target_id is defined and TargetOndemand is defined
when: target_id is defined and TargetOndemand is defined and ( TargetOndemand != 0 and TargetOndemand != false )
uri:
url: "{{mui.URL}}/index.php?r=restapi/target-ondemand/create&access-token={{TOKEN}}"
validate_certs: false
Expand Down
3 changes: 2 additions & 1 deletion docs/DOCKER-REGISTRY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ There are many ways you can do that depending on your network topology and avail

The following guide will provide instructions on running your own registry.

## On VPN gateway
## On VPN gateway (OpenBSD)
The suggested way is to run the docker registry on its own system, however the
next best thing as far as flexibility goes is to run it on your VPN gateway and
limit access to the registry to `dockerd` servers.
Expand All @@ -20,6 +20,7 @@ ansible-playbook --connection=local -i 127.0.0.1, runonce/docker-registry.yml
ansible-playbook --connection=local -i 127.0.0.1, runonce/docker-registry.yml -e '@settings.yml'
```

## On own server (OpenBSD)
Alternatively, you can proceed with manual installation by following the steps.

Install the needed packages
Expand Down
4 changes: 2 additions & 2 deletions docs/ansible/DOCKER-TARGETS.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Feed the data to the backend
ansible-playbook playbooks/feed-targets.yml -i inventories/targets -e '{"mui":{"URL": "http://127.0.0.1:8080"}}'
```

You can also create a `group_vars` for the targets to include all those extra-vars details and not having to type them again
You can also create a file at `inventories/targets/group_vars/all.yml` for the targets to include all those extra-vars details and not having to type them again
```yaml
DOCKER_REGISTRY: "myregistry:5000"
DOCKER_REPOSITORY: "targets"
Expand Down Expand Up @@ -146,4 +146,4 @@ This playbook provides a few tags to ease in managing single tasks, such as
These tags can be used to perform a specific task or to skip some ie
```sh
ansible-playbook playbooks/build-squash.yml -i inventories/targets --skip-tags push,rmi
```
```
2 changes: 1 addition & 1 deletion frontend/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"minimum-stability": "stable",
"require": {
"php": ">=5.4.0 || >=8",
"yiisoft/yii2": "~2.0.45",
"yiisoft/yii2": "2.0.45",
"yiisoft/yii2-bootstrap": "~2.0.0",
"yiisoft/yii2-bootstrap4": "^2.0",
"overals/yii2-whois": "~1.0.0",
Expand Down