krincap/gitlab-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #98 from corvus-migratorius/fix-caddy-shell

Browse Source 
Fix the shell path for the caddy user
This commit is contained in:
Alexander Gorelyshev
2026-05-26 17:29:58 +04:00
committed by GitHub
parent 3ec4e44327 82690466cc
commit 971006fbcd
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/kics.yml vendored
View File

@@ -14,7 +14,7 @@ jobs:
name: Check out source code name: Check out source code
- name: run a KICS scan - name: run a KICS scan
uses: checkmarx/kics-github-action@63fca4ca72e56edbb5a599ee756e6af1fdb1e785 uses: checkmarx/kics-github-action@05aa5eb70eede1355220f4ca5238d96b397e30a6
with: with:
path: . path: .
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}

2
.github/workflows/linters.yml vendored
View File

@@ -13,7 +13,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
- uses: mamba-org/setup-micromamba@4d84239119b14cba1690b971f05c0bab912bea04 - uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462
with: with:
micromamba-version: '2.4.0-0' micromamba-version: '2.4.0-0'
environment-file: ci/conda.yml environment-file: ci/conda.yml

4
.github/workflows/molecule.yml vendored
View File

@@ -16,7 +16,7 @@ jobs:
steps: steps:
- name: Get PR files and build role matrix - name: Get PR files and build role matrix
id: make-matrix id: make-matrix
uses: actions/github-script@v8 uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
with: with:
script: | script: |
if (!context.payload.pull_request?.number) { if (!context.payload.pull_request?.number) {
@@ -64,7 +64,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: "Set up micromamba" - name: "Set up micromamba"
uses: mamba-org/setup-micromamba@4d84239119b14cba1690b971f05c0bab912bea04 uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462
if: ${{ matrix.role != '__no_role__' }} if: ${{ matrix.role != '__no_role__' }}
with: with:
micromamba-version: '2.4.0-0' micromamba-version: '2.4.0-0'

11
roles/caddy/tasks/main.yml
View File

@@ -3,7 +3,7 @@
ansible.builtin.user: ansible.builtin.user:
name: caddy name: caddy
comment: "Caddy web server" comment: "Caddy web server"
shell: /bin/nologin shell: /sbin/nologin
home: /var/lib/caddy home: /var/lib/caddy
state: present state: present
system: true system: true
@@ -80,3 +80,12 @@
owner: root owner: root
group: root group: root
mode: "0644" mode: "0644"
- name: "Create a directory for Caddy logs"
when: caddy_log_path is defined
ansible.builtin.file:
state: directory
path: "{{ caddy_log_path }}"
owner: caddy
group: caddy
mode: "0755"