diff options
| author | Romain Porte <microjoe@microjoe.org> | 2019-12-01 21:23:05 +0100 |
|---|---|---|
| committer | Romain Porte <microjoe@microjoe.org> | 2020-05-08 20:31:46 +0200 |
| commit | 12667986a94aff8476ac50409a53e444af774533 (patch) | |
| tree | a0f23cfa8b45b58fd3b9406157e3670dc2fc9e1d | |
| parent | adc7d70e6e55c156a397edfef37287b76cd583e1 (diff) | |
| download | MicroJoe.ttrss-12667986a94aff8476ac50409a53e444af774533.tar.gz MicroJoe.ttrss-12667986a94aff8476ac50409a53e444af774533.zip | |
debian buster update
| -rw-r--r-- | defaults/main.yml | 4 | ||||
| -rw-r--r-- | tasks/main.yml | 23 | ||||
| -rw-r--r-- | templates/nginx.j2 | 2 | ||||
| -rw-r--r-- | templates/php-fpm.conf | 2 |
4 files changed, 19 insertions, 12 deletions
diff --git a/defaults/main.yml b/defaults/main.yml index 2caa477..1e2057c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,6 +15,6 @@ ttrss_db_name: ttrss nginx_server_name: ttrss.localhost letsencrypt_wellknown: /var/www/letsencrypt -letsencrypt_activate: false -letsencrypt_https: false +letsencrypt_activate: true +letsencrypt_https: true letsencrypt_domain: "{{ nginx_server_name }}" diff --git a/tasks/main.yml b/tasks/main.yml index 9a97014..11db67c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,6 +1,9 @@ --- # tasks file for MicroJoe.ttrss +- name: Ensure "{{ ttrss_group }}" group exists + group: + name: "{{ ttrss_group }}" - name: Ensure user exists user: @@ -10,13 +13,16 @@ - name: Install dependencies apt: - name: "{{ item }}" + name: + - php-curl + - php-fpm + - php-intl + - php-mbstring + - php-pgsql + - php-xml + - postgresql + - python-psycopg2 state: present - with_items: - - python-psycopg2 - - postgresql - - php-pgsql - - php-curl - name: Create ttrss base directory file: @@ -31,6 +37,7 @@ git: repo: "{{ ttrss_repository }}" dest: "{{ ttrss_base }}" + version: "{{ ttrss_version }}" register: git_updated # PostgreSQL commands @@ -78,11 +85,11 @@ - name: Install php-fpm pool configuration file template: src: templates/php-fpm.conf - dest: /etc/php/7.0/fpm/pool.d/ttrss.conf + dest: /etc/php/7.3/fpm/pool.d/ttrss.conf notify: restart php-fpm - name: Verify php-fpm configuration - command: php-fpm7.0 --test + command: php-fpm7.3 --test changed_when: false # Install update feed systemd service diff --git a/templates/nginx.j2 b/templates/nginx.j2 index b6aafa7..015e475 100644 --- a/templates/nginx.j2 +++ b/templates/nginx.j2 @@ -60,7 +60,7 @@ server { fastcgi_split_path_info ^(.+\.php)(/.+)$; # filter and proxy PHP requests to PHP-FPM - fastcgi_pass unix:/var/run/php/php7.0-fpm-ttrss.sock; + fastcgi_pass unix:/var/run/php/php7.3-fpm-ttrss.sock; fastcgi_index index.php; include fastcgi.conf; } diff --git a/templates/php-fpm.conf b/templates/php-fpm.conf index a17ef22..b2457e8 100644 --- a/templates/php-fpm.conf +++ b/templates/php-fpm.conf @@ -2,7 +2,7 @@ user = {{ ttrss_user }} group = {{ ttrss_group }} -listen = /var/run/php/php7.0-fpm-ttrss.sock +listen = /var/run/php/php7.3-fpm-ttrss.sock listen.owner = www-data listen.group = www-data |