diff --git a/inventories/chaosknoten/host_vars/eh22-wiki.yaml b/inventories/chaosknoten/host_vars/eh22-wiki.yaml index 4b7ce47..a8814c0 100644 --- a/inventories/chaosknoten/host_vars/eh22-wiki.yaml +++ b/inventories/chaosknoten/host_vars/eh22-wiki.yaml @@ -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" diff --git a/roles/dokuwiki/README.md b/roles/dokuwiki/README.md index b6bd80d..457dd45 100644 --- a/roles/dokuwiki/README.md +++ b/roles/dokuwiki/README.md @@ -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 diff --git a/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml index 33ba384..8358114 100644 --- a/roles/dokuwiki/defaults/main.yml +++ b/roles/dokuwiki/defaults/main.yml @@ -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: "" diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml index 8c836ce..664f159 100644 --- a/roles/dokuwiki/tasks/main.yml +++ b/roles/dokuwiki/tasks/main.yml @@ -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 != ""