Try different method so we get new lines
This commit is contained in:
@@ -11,7 +11,8 @@ storage:
|
|||||||
files:
|
files:
|
||||||
- path: /var/home/core/.bashrc
|
- path: /var/home/core/.bashrc
|
||||||
append:
|
append:
|
||||||
- inline: "alias dc='docker compose -f /var/docker/docker-compose.yml'"
|
- inline: |
|
||||||
|
alias dc='docker compose -f /var/docker/docker-compose.yml'
|
||||||
directories:
|
directories:
|
||||||
- path: /var/docker
|
- path: /var/docker
|
||||||
user:
|
user:
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
"append": [
|
"append": [
|
||||||
{
|
{
|
||||||
"compression": "",
|
"compression": "",
|
||||||
"source": "data:,alias%20dc%3D'docker%20compose%20-f%20%2Fvar%2Fdocker%2Fdocker-compose.yml'"
|
"source": "data:,alias%20dc%3D'docker%20compose%20-f%20%2Fvar%2Fdocker%2Fdocker-compose.yml'%0A"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,10 +43,9 @@ storage:
|
|||||||
source: https://git.mrmeeb.stream/mrmeeb-labs/supporting-services/raw/branch/main/.env
|
source: https://git.mrmeeb.stream/mrmeeb-labs/supporting-services/raw/branch/main/.env
|
||||||
- path: /var/home/core/.bashrc
|
- path: /var/home/core/.bashrc
|
||||||
append:
|
append:
|
||||||
# Add step alias
|
- inline: |
|
||||||
- inline: "alias step='docker run --rm -v /var/home/core:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step'"
|
alias step='docker run --rm -v /var/home/core:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step'
|
||||||
# Add sops alias
|
alias sops='docker run --rm -it -v /var/home/core:/root -v /var/docker:/var/docker ghcr.io/getsops/sops:v3.11.0'
|
||||||
- inline: "alias sops='docker run --rm -it -v /var/home/core:/root -v /var/docker:/var/docker ghcr.io/getsops/sops:v3.11.0'"
|
|
||||||
|
|
||||||
systemd:
|
systemd:
|
||||||
units:
|
units:
|
||||||
@@ -64,7 +63,7 @@ systemd:
|
|||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
ExecStart=/usr/bin/docker run --rm -v ${HOME}:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step ca bootstrap --team mtls --team-url "https://mrmeeb.co.uk/step/<>"
|
ExecStart=/usr/bin/docker run --rm -v /var/home/core:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step ca bootstrap --team mtls --team-url "https://mrmeeb.co.uk/step/<>"
|
||||||
ExecStart=/usr/bin/touch /var/lib/%N.stamp
|
ExecStart=/usr/bin/touch /var/lib/%N.stamp
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
@@ -64,12 +64,8 @@
|
|||||||
"path": "/var/home/core/.bashrc",
|
"path": "/var/home/core/.bashrc",
|
||||||
"append": [
|
"append": [
|
||||||
{
|
{
|
||||||
"compression": "",
|
"compression": "gzip",
|
||||||
"source": "data:,alias%20step%3D'docker%20run%20--rm%20-v%20%2Fvar%2Fhome%2Fcore%3A%2Fhome%2Fstep%20-e%20STEPPATH%3D%2Fhome%2Fstep%2F.step%20smallstep%2Fstep-cli%20step'"
|
"source": "data:;base64,H4sIAAAAAAAC/2yNscrDMAyE9zyFtky2/vBvhgwdCh0DzQsYVySmdhVk189f7BTSIctxOkn32eBtgpRpG/sHuycJyPsFSkkEVQCLFVw5EjoWMrut16AI7vN1mi7zbTxi1G2Zog2hzVWUC74h+u6L4y2d4Hw+Qwrzke8/5sfDsjrRnnGhXHuxiin/ehj0X999AgAA///HAo1T4AAAAA=="
|
||||||
},
|
|
||||||
{
|
|
||||||
"compression": "",
|
|
||||||
"source": "data:,alias%20sops%3D'docker%20run%20--rm%20-it%20-v%20%2Fvar%2Fhome%2Fcore%3A%2Froot%20-v%20%2Fvar%2Fdocker%3A%2Fvar%2Fdocker%20ghcr.io%2Fgetsops%2Fsops%3Av3.11.0'"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -78,7 +74,7 @@
|
|||||||
"systemd": {
|
"systemd": {
|
||||||
"units": [
|
"units": [
|
||||||
{
|
{
|
||||||
"contents": "[Unit]\nDescription=Bootstrap step-ca\nWants=network-online.target\nAfter=rpm-ostree-install-docker-ce.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/docker run --rm -v ${HOME}:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step ca bootstrap --team mtls --team-url \"https://mrmeeb.co.uk/step/\u003c\u003e\"\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target",
|
"contents": "[Unit]\nDescription=Bootstrap step-ca\nWants=network-online.target\nAfter=rpm-ostree-install-docker-ce.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/docker run --rm -v /var/home/core:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step ca bootstrap --team mtls --team-url \"https://mrmeeb.co.uk/step/\u003c\u003e\"\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target",
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"name": "bootstrap-step-ca.service"
|
"name": "bootstrap-step-ca.service"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user