From da2e1a6d783eee6f0ed9c6b1323a0109e6e03804 Mon Sep 17 00:00:00 2001 From: Jayne Passmore Date: Fri, 25 Apr 2025 14:04:48 -0500 Subject: [PATCH] finished adding elements to role --- files/nextcloud.hook | 13 ++++++++++++ files/profiled-nextcloud.sh | 1 + handlers/main.yml | 4 ++++ tasks/main.yml | 42 ++++++++++++++++++++++++++++++------- 4 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 files/nextcloud.hook create mode 100644 files/profiled-nextcloud.sh diff --git a/files/nextcloud.hook b/files/nextcloud.hook new file mode 100644 index 0000000..43b139f --- /dev/null +++ b/files/nextcloud.hook @@ -0,0 +1,13 @@ +# Update Nextcloud when core or -apps are touched + +[Trigger] +Operation = Install +Operation = Upgrade +Type = Package +Target = nextcloud +Target = nextcloud-app-* + +[Action] +Description = Updating Nextcloud installation +When = PostTransaction +Exec = /usr/bin/runuser -u nextcloud -- /usr/bin/php-legacy --php-ini /etc/webapps/nextcloud/php.ini /usr/share/webapps/nextcloud/occ upgrade \ No newline at end of file diff --git a/files/profiled-nextcloud.sh b/files/profiled-nextcloud.sh new file mode 100644 index 0000000..6d178bb --- /dev/null +++ b/files/profiled-nextcloud.sh @@ -0,0 +1 @@ +export NEXTCLOUD_PHP_CONFIG=/etc/webapps/nextcloud/php.ini \ No newline at end of file diff --git a/handlers/main.yml b/handlers/main.yml index d78cbd4..2567ef0 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,3 +1,7 @@ #SPDX-License-Identifier: MIT-0 --- # handlers file for role-nextcloud +- name: restart nginx + service: + name: nginx + state: restarted \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index 038569b..4932613 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -11,6 +11,8 @@ - php-legacy-igbinary - php-legacy-redis - php-legacy-fpm + - valkey + - ffmpeg state: present - name: deploy nextcloud php.ini file @@ -26,6 +28,11 @@ group: nextcloud mode: '0700' +- name: deploy profile.d-nextcloud file + ansible.builtin.copy: + src: files/profile.d-nextcloud.sh + dest: /etc/profile.d/nextcloud.sh + - name: Create sessions directory ansible.builtin.file: path: /var/lib/nextcloud/sessions @@ -65,13 +72,12 @@ ansible.builtin.copy: src: files/php-fpm-override.conf dest: /etc/systemd/system/php-fpm-legacy.service.d/override.conf -#notify php-fpm-legacy - name: deploy nextcloud nginx file ansible.builtin.template: src: templates/nginx-nextcloud.conf dest: /etc/nginx/conf.d/nextcloud.conf -#notify nginx + notify: restart nginx - name: ensure nextcloud-cron override directory exists ansible.builtin.file: @@ -83,10 +89,30 @@ src: files/nextcloud-cron-override.conf dest: /etc/systemd/system/nextcloud-cron.service.d/override.conf -#- name: ensure nextcloud is running -# service: -# name: nextcloud -# state: started -# enabled: yes +- name: Create pacman hook directory + ansible.builtin.file: + path: /etc/pacman.d/hooks + state: directory -# start/enable php-fpm-legacy \ No newline at end of file +- name: deploy pacman hook + ansible.builtin.copy: + src: files/nextcloud.hook + dest: /etc/pacman.d/hooks/10-nextcloud.hook + +- name: Add nextcloud user to valkey group + ansible.builtin.user: + name: nextcloud + groups: valkey + append: yes + +- name: ensure valkey is running + service: + name: valkey + state: started + enabled: yes + +- name: ensure php-fpm-legacy is running + service: + name: php-fpm-legacy + state: started + enabled: yes \ No newline at end of file