diff --git a/roles/firefly3/tasks/cron.yml b/roles/firefly3/tasks/cron.yml index 37739f8..b0a2cd5 100644 --- a/roles/firefly3/tasks/cron.yml +++ b/roles/firefly3/tasks/cron.yml @@ -6,4 +6,4 @@ name: firefly-iii-cron minute: 0 hour: 3 - job: "/usr/bin/php {{ firefly3_local_path }} firefly-iii:cron" + job: "/usr/bin/php {{ firefly3_home }} firefly-iii:cron" diff --git a/roles/firefly3/tasks/firefly3.yml b/roles/firefly3/tasks/firefly3.yml index 62e8a28..88f5183 100644 --- a/roles/firefly3/tasks/firefly3.yml +++ b/roles/firefly3/tasks/firefly3.yml @@ -3,7 +3,7 @@ - name: Create application directory ansible.builtin.file: state: directory - dest: "{{ firefly3_local_path }}" + dest: "{{ firefly3_home }}" owner: root group: www-data mode: "0o750" @@ -12,7 +12,7 @@ ansible.builtin.unarchive: remote_src: true src: "{{ firefly3_url }}" - dest: "{{ firefly3_local_path }}" + dest: "{{ firefly3_home }}" owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" @@ -22,7 +22,7 @@ - name: Put config file ansible.builtin.template: src: "env.j2" - dest: "{{ firefly3_local_path }}/.env" + dest: "{{ firefly3_home }}/.env" owner: root group: www-data mode: "0o640" @@ -30,7 +30,7 @@ - name: Check writable dirs ansible.builtin.file: state: directory - dest: "{{ firefly3_local_path }}/{{ item }}" + dest: "{{ firefly3_home }}/{{ item }}" owner: root group: www-data recurse: true diff --git a/roles/firefly3/vars/main.yml b/roles/firefly3/vars/main.yml index c78b317..dd9a906 100644 --- a/roles/firefly3/vars/main.yml +++ b/roles/firefly3/vars/main.yml @@ -4,4 +4,4 @@ firefly3_version: "6.2.6" firefly3_url: "https://github.com/firefly-iii/firefly-iii/releases/download/v{{ firefly3_version }}/FireflyIII-v{{ firefly3_version }}.tar.gz" firefly3_access_url: "{{ web_hostname | selectattr('type', 'defined') | selectattr('type', '==', 'firefly3') | map(attribute='host') | first }}" -firefly3_local_path: "/srv/http/{{ firefly3_access_url }}" +firefly3_home: "/srv/http/{{ firefly3_access_url }}" diff --git a/roles/freshrss/tasks/freshrss.yml b/roles/freshrss/tasks/freshrss.yml index 523c0f0..2293894 100644 --- a/roles/freshrss/tasks/freshrss.yml +++ b/roles/freshrss/tasks/freshrss.yml @@ -3,7 +3,7 @@ - name: Create application directory ansible.builtin.file: state: directory - dest: "{{ freshrss_local_path }}" + dest: "{{ freshrss_home }}" owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" @@ -12,7 +12,7 @@ ansible.builtin.unarchive: remote_src: true src: "{{ freshrss_url }}" - dest: "{{ freshrss_local_path }}" + dest: "{{ freshrss_home }}" owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" @@ -31,7 +31,7 @@ - name: Check writable dirs ansible.builtin.file: state: directory - dest: "{{ freshrss_local_path }}/{{ item }}" + dest: "{{ freshrss_home }}/{{ item }}" owner: root group: www-data mode: "g+w" diff --git a/roles/freshrss/templates/freshrss.service.j2 b/roles/freshrss/templates/freshrss.service.j2 index 0c50f4d..7acdc50 100644 --- a/roles/freshrss/templates/freshrss.service.j2 +++ b/roles/freshrss/templates/freshrss.service.j2 @@ -5,4 +5,4 @@ Wants=freshrss.timer [Service] User=www-data Type=simple -ExecStart=/usr/bin/php {{ freshrss_local_path }}/app/actualize_script.php +ExecStart=/usr/bin/php {{ freshrss_home }}/app/actualize_script.php diff --git a/roles/freshrss/vars/main.yml b/roles/freshrss/vars/main.yml index 78111bb..1c7368b 100644 --- a/roles/freshrss/vars/main.yml +++ b/roles/freshrss/vars/main.yml @@ -4,5 +4,5 @@ freshrss_version: "1.25.0" freshrss_url: "https://github.com/FreshRSS/FreshRSS/archive/refs/tags/{{ freshrss_version }}.tar.gz" freshrss_access_url: "{{ web_hostname | selectattr('type', 'defined') | selectattr('type', '==', 'freshrss') | map(attribute='host') | first }}" -freshrss_local_path: "/srv/http/{{ freshrss_access_url }}" -freshrss_config_path: "{{ freshrss_local_path }}/data/config.php" +freshrss_home: "/srv/http/{{ freshrss_access_url }}" +freshrss_config_path: "{{ freshrss_home }}/data/config.php" diff --git a/roles/nextcloud/tasks/nextcloud.yml b/roles/nextcloud/tasks/nextcloud.yml index 19353b0..e1292d6 100644 --- a/roles/nextcloud/tasks/nextcloud.yml +++ b/roles/nextcloud/tasks/nextcloud.yml @@ -3,7 +3,7 @@ - name: Create application directory ansible.builtin.file: state: directory - dest: "{{ nextcloud_local_path }}" + dest: "{{ nextcloud_home }}" owner: root group: www-data mode: "0o750" @@ -12,7 +12,7 @@ ansible.builtin.unarchive: remote_src: true src: "{{ nextcloud_url }}" - dest: "{{ nextcloud_local_path }}" + dest: "{{ nextcloud_home }}" owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" @@ -24,7 +24,7 @@ - name: Put config file ansible.builtin.template: src: "config.php.j2" - dest: "{{ nextcloud_local_path }}/config/config.php" + dest: "{{ nextcloud_home }}/config/config.php" owner: www-data group: www-data mode: "0o640" @@ -32,7 +32,7 @@ - name: Set config dir permissions ansible.builtin.file: state: directory - dest: "{{ nextcloud_local_path }}/config" + dest: "{{ nextcloud_home }}/config" owner: www-data group: www-data mode: "0o750" @@ -40,7 +40,7 @@ - name: Check writable dirs ansible.builtin.file: state: directory - dest: "{{ nextcloud_local_path }}/{{ item }}" + dest: "{{ nextcloud_home }}/{{ item }}" owner: root group: www-data mode: "g+w" @@ -54,5 +54,5 @@ become_user: www-data ansible.builtin.command: cmd: "php occ upgrade" - chdir: "{{ nextcloud_local_path }}" + chdir: "{{ nextcloud_home }}" changed_when: false diff --git a/roles/nextcloud/vars/main.yml b/roles/nextcloud/vars/main.yml index 6c389a5..59d139b 100644 --- a/roles/nextcloud/vars/main.yml +++ b/roles/nextcloud/vars/main.yml @@ -5,4 +5,4 @@ nextcloud_url: "https://download.nextcloud.com/server/releases/nextcloud-{{ next nextcloud_access_url: "{{ web_hostname | selectattr('type', 'defined') | selectattr('type', '==', 'nextcloud') | map(attribute='host') | first }}" -nextcloud_local_path: "/srv/http/{{ nextcloud_access_url }}" +nextcloud_home: "/srv/http/{{ nextcloud_access_url }}" diff --git a/roles/roundcube/tasks/roundcube.yml b/roles/roundcube/tasks/roundcube.yml index d4a8087..c36099a 100644 --- a/roles/roundcube/tasks/roundcube.yml +++ b/roles/roundcube/tasks/roundcube.yml @@ -3,7 +3,7 @@ - name: Create application directory ansible.builtin.file: state: directory - dest: "{{ roundcube_local_path }}" + dest: "{{ roundcube_home }}" owner: "root" group: "www-data" mode: "0o750" @@ -12,7 +12,7 @@ ansible.builtin.unarchive: remote_src: true src: "{{ roundcube_url }}" - dest: "{{ roundcube_local_path }}" + dest: "{{ roundcube_home }}" owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" @@ -32,7 +32,7 @@ ansible.builtin.file: state: directory recurse: true - dest: "{{ roundcube_local_path }}/{{ item }}" + dest: "{{ roundcube_home }}/{{ item }}" owner: root group: www-data mode: "g+w" diff --git a/roles/roundcube/tasks/roundcube_carddav.yml b/roles/roundcube/tasks/roundcube_carddav.yml index 0bd46c6..099a1d9 100644 --- a/roles/roundcube/tasks/roundcube_carddav.yml +++ b/roles/roundcube/tasks/roundcube_carddav.yml @@ -4,7 +4,7 @@ ansible.builtin.unarchive: remote_src: true src: "{{ roundcube_carddav_url }}" - dest: "{{ roundcube_local_path }}/plugins" + dest: "{{ roundcube_home }}/plugins" owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" @@ -12,7 +12,7 @@ - name: Put carddav config file ansible.builtin.template: src: "carddav.config.inc.php.j2" - dest: "{{ roundcube_local_path }}/plugins/carddav/config.inc.php" + dest: "{{ roundcube_home }}/plugins/carddav/config.inc.php" owner: root group: www-data mode: "0o640" diff --git a/roles/roundcube/vars/main.yml b/roles/roundcube/vars/main.yml index 784c4e3..c7f864f 100644 --- a/roles/roundcube/vars/main.yml +++ b/roles/roundcube/vars/main.yml @@ -7,8 +7,8 @@ roundcube_url: "https://github.com/roundcube/roundcubemail/releases/download/{{ # only the first occurence is supported roundcube_access_url: "{{ web_hostname | selectattr('type', 'defined') | selectattr('type', '==', 'roundcube') | map(attribute='host') | first }}" -roundcube_local_path: "/srv/http/{{ roundcube_access_url }}" -roundcube_config_path: "{{ roundcube_local_path }}/config/config.inc.php" +roundcube_home: "/srv/http/{{ roundcube_access_url }}" +roundcube_config_path: "{{ roundcube_home }}/config/config.inc.php" roundcube_carddav_version: "5.1.0" roundcube_carddav_url: "https://github.com/mstilkerich/rcmcarddav/releases/download/v{{ roundcube_carddav_version }}/carddav-v{{ roundcube_carddav_version }}.tar.gz" diff --git a/roles/shaarli/tasks/main.yml b/roles/shaarli/tasks/main.yml index c9781b8..3fe14e3 100644 --- a/roles/shaarli/tasks/main.yml +++ b/roles/shaarli/tasks/main.yml @@ -3,7 +3,7 @@ - name: Create application directory ansible.builtin.file: state: directory - path: "{{ shaarli_local_path }}" + path: "{{ shaarli_home }}" owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" @@ -12,7 +12,7 @@ ansible.builtin.unarchive: remote_src: true src: "{{ shaarli_url }}" - dest: "{{ shaarli_local_path }}" + dest: "{{ shaarli_home }}" owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" @@ -23,7 +23,7 @@ - name: Check writable dirs ansible.builtin.file: state: directory - dest: "{{ shaarli_local_path }}/{{ item }}" + dest: "{{ shaarli_home }}/{{ item }}" owner: root group: www-data recurse: true diff --git a/roles/shaarli/vars/main.yml b/roles/shaarli/vars/main.yml index 0724cfa..8baf949 100644 --- a/roles/shaarli/vars/main.yml +++ b/roles/shaarli/vars/main.yml @@ -4,4 +4,4 @@ shaarli_version: "0.14.0" shaarli_url: "https://github.com/shaarli/Shaarli/releases/download/v{{ shaarli_version }}/shaarli-v{{ shaarli_version }}-full.tar.gz" shaarli_access_url: "{{ web_hostname | selectattr('type', 'defined') | selectattr('type', '==', 'shaarli') | map(attribute='host') | first }}" -shaarli_local_path: "/srv/http/{{ shaarli_access_url }}" +shaarli_home: "/srv/http/{{ shaarli_access_url }}"