Compare commits

..

10 commits

Author SHA1 Message Date
b133670544
check(playbook): print all held packages
All checks were successful
/ Ansible Lint (push) Successful in 1m44s
/ Ansible Lint (pull_request) Successful in 1m41s
2025-02-18 04:28:08 +01:00
381811d58d
nginx(role): simplify description in README
All checks were successful
/ Ansible Lint (push) Successful in 2m14s
/ Ansible Lint (pull_request) Successful in 2m14s
2025-02-18 04:11:33 +01:00
eb8254bcaf
nginx(role): use better naming, wording and file structure
All checks were successful
/ Ansible Lint (push) Successful in 1m48s
/ Ansible Lint (pull_request) Successful in 2m26s
2025-02-18 04:07:07 +01:00
8a390f6d6b
nginx(role): remove unneces. "hosts" and "entry points" sec. from README 2025-02-18 03:59:16 +01:00
177ad7d3be
nginx(role): add "logging" to the reserved configuration names 2025-02-18 03:59:16 +01:00
f59c5996bb
nginx(role): document Debian 12 support 2025-02-18 03:59:16 +01:00
ceb5598f6c
nginx(role): document arguments in README for better discoverability
Document the role arguments in the README instead of in the
argument_specs for better discoverability and readability.
2025-02-18 03:59:16 +01:00
bbf8e56b4b
nginx(role): simplify ensuring that gnupg is installed
Also improve naming.
2025-02-18 03:59:16 +01:00
9ee5c6542b
nginx(role): simplify installation by removing version spec
We always just want the latest anyway and therefore don't use it, so no
need to keep the complexity introduced by that setting.
Also merge repo_setup and nginx_install task lists into one
nginx_install task list as keeping two files isn't necessary.
Finally improving naming a bit.
2025-02-18 03:59:08 +01:00
938ca6d786
nginx(role): remove unnecessary apt-get update step
The nginx package gets installed with "update_cache: true" afterwards
anyway, so the apt-get update step shouldn't be necessary.
2025-02-18 02:59:00 +01:00
4 changed files with 1 additions and 28 deletions

View file

@ -9,6 +9,3 @@ certbot__certificate_domains:
- "eh22.easterhegg.eu"
certbot__new_cert_commands:
- "systemctl reload nginx.service"
dokuwiki__custom_theme_git_url: "https://git.hamburg.ccc.de/EH22/dokuwiki-template-sprintdoc-modified.git"
dokuwiki__custom_theme_version: "eh22"
dokuwiki__custom_theme_name: "sprintdoc"

View file

@ -22,12 +22,6 @@ None.
- `dokuwiki__php_version`: Your PHP version, default `7.4` for Debian 11 and `8.2` for Debian 12
- `dokuwiki__php_user`: User of your php-fpm process, default `www-data`
- `dokuwiki__nginx_user`: User of your nginx process, default `nginx`
- `dokuwiki__custom_theme_git_url`: Clone URL of custom theme (HTTPS only)
- `dokuwiki__custom_theme_version`: Version (git branch, tag, ...) to checkout, default main
- `dokuwiki__custom_theme_name`: Name of the directory into which the custom theme is cloned
Warning: if a directory of the same name as `dokuwiki__custom_theme_name` already exists in the same directory, the task will fail.
This needs to be manually deleted first before the first run with the the custom theme enabled.
## nginx Configuration

View file

@ -3,6 +3,3 @@ dokuwiki__installpath: "/var/www/dokuwiki"
dokuwiki__php_version: "{{ dokuwiki__php_versions[ansible_distribution + '-' + ansible_distribution_major_version] }}"
dokuwiki__php_user: "www-data"
dokuwiki__nginx_user: "nginx"
dokuwiki__custom_theme_git_url: ""
dokuwiki__custom_theme_version: "main"
dokuwiki__custom_theme_name: ""

View file

@ -1,4 +1,4 @@
- name: Install dependencies
- name: Install php-fpm
become: true
ansible.builtin.apt:
name:
@ -9,7 +9,6 @@
- php-intl
- php-gd
- php-sqlite3
- git
diff: false
- name: Ensure `php-fpm` is enabled
@ -43,17 +42,3 @@
owner: root
group: root
mode: "0644"
- name: checkout custom theme git repo
become: true
ansible.builtin.git:
repo: "{{ dokuwiki__custom_theme_git_url }}"
dest: "{{ dokuwiki__installpath }}/lib/tpl/{{ dokuwiki__custom_theme_name }}"
version: "{{ dokuwiki__custom_theme_version }}"
force: true
depth: 1
single_branch: true
track_submodules: true
when:
- dokuwiki__custom_theme_git_url != ""
- dokuwiki__custom_theme_name != ""