Upgrade selfoss to current version. Use release to include php dependencies. Ensure data is saved between upgrades and re-runs.

roles/news/defaults/main.yml

@@ -2,15 +2,18 @@ secret_root: '{{ inventory_dir | realpath }}'
 secret_name: 'secret'
 secret: '{{ secret_root + "/" + secret_name }}'
 
-selfoss_domain: "news.{{ domain }}"
+selfoss_subdomain: "news"
+selfoss_domain: "{{ selfoss_subdomain }}.{{ domain }}"
+
 selfoss_db_username: selfoss
 selfoss_db_password: "{{ lookup('password', secret + '/' + 'selfoss_db_password length=32') }}"
 selfoss_db_database: selfoss
-selfoss_version: 2.16
+
+selfoss_version: 2.18
 
 selfoss_username: "{{ main_user_name }}"
 # this is the sha512 hash of the desired password
-selfoss_password_hash: "{{ lookup('password', secret + '/' + 'selfoss_password_hash', length=32, crypt='sha512')|hash('sha512') }}"
+selfoss_password_hash: "{{ lookup('password', secret + '/' + 'selfoss_password_hash length=32') | hash('sha512') }}"
 
 # must match values in roles/common
 db_admin_username: 'postgres'

roles/news/tasks/main.yml

@@ -1 +1 @@
-- include: selfoss.yml tags=selfoss
+- include: selfoss.yml tags=selfoss

roles/news/tasks/selfoss.yml

@@ -1,51 +1,92 @@
-- name: Clone Selfoss
-  git: repo=https://github.com/SSilence/selfoss.git
-       dest=/var/www/selfoss
-       accept_hostkey=yes
-       version={{ selfoss_version }}
+- name: Install selfoss dependencies
+  apt:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+    - php
+    - php-pgsql
+    - php-gd
+    - curl
+    - unzip
+  tags:
+    - dependencies
+
+- name: Create Selfoss temp directory
+  file: path=/root/selfoss state=directory
+
+- name: Download Selfoss-{{ selfoss_version }}
+  get_url:
+    url=https://github.com/SSilence/selfoss/releases/download/{{ selfoss_version }}/selfoss-{{ selfoss_version }}.zip
+    dest=/root/selfoss/selfoss-{{ selfoss_version }}.zip
+
+- name: Create Selfoss unpack directory
+  file: path=/root/selfoss/selfoss-{{ selfoss_version }} state=directory
+
+- name: Extract Selfoss archive
+  unarchive:
+    copy: no
+    src: /root/selfoss/selfoss-{{ selfoss_version }}.zip
+    dest: /root/selfoss/selfoss-{{ selfoss_version }}/
+    creates: /root/selfoss-{{ selfoss_version }}/index.php
+
+- name: Back-Up old Selfoss data
+  shell: cp -r /var/www/selfoss/data /root/selfoss/data_bak || true
+
+- name: Delete old Selfoss document root
+  file: path=/var/www/selfoss state=absent
+
+- name: Copy Selfoss source to document root
+  shell: cp -r /root/selfoss/selfoss-{{ selfoss_version }} /var/www/selfoss
+
+- name: Delete empty Selfoss data
+  file: path=/var/www/selfoss/data state=absent
+
+- name: Restore old Selfoss data
+  shell: cp -r /root/selfoss/data_bak /var/www/selfoss/data || cp -r /root/selfoss/selfoss-{{ selfoss_version }}/data /var/www/selfoss/data
+
+- name: Delete old Selfoss source
+  file: path=/root/selfoss state=absent
 
 - name: Set selfoss ownership
   action: file owner=root group=www-data path=/var/www/selfoss recurse=yes state=directory
 
-# only data/cache, data/favicons, data/logs, data/thumbnails, data/sqlite public/ should be writeable by httpd
 - name: Set selfoss permission
   action: file path=/var/www/selfoss/{{ item }} mode=0775
   with_items:
     - data/cache
     - data/favicons
+    - data/fulltextrss
     - data/logs
-    - data/thumbnails
     - data/sqlite
+    - data/thumbnails
     - public
 
-- name: Install selfoss dependencies (PHP5 variant)
-  apt: pkg={{ item }} state=present
-  with_items:
-    - php5
-    - php5-pgsql
-    - php5-gd
-  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
-  tags:
-    - dependencies
-
-- name: Install selfoss dependencies
-  apt: pkg={{ item }} state=present
-  with_items:
-    - php
-    - php-pgsql
-    - php-gd
-  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
-  tags:
-    - dependencies
-
 - name: Create database user for selfoss
-  postgresql_user: login_host=localhost login_user={{ db_admin_username }} login_password="{{ db_admin_password }}" name={{ selfoss_db_username }} password="{{ selfoss_db_password }}" state=present
+  postgresql_user:
+    login_host=localhost
+    login_user={{ db_admin_username }}
+    login_password="{{ db_admin_password }}"
+    name={{ selfoss_db_username }}
+    password="{{ selfoss_db_password }}"
+    state=present
 
 - name: Create database for selfoss
-  postgresql_db: login_host=localhost login_user={{ db_admin_username }} login_password="{{ db_admin_password }}" name={{ selfoss_db_database }} state=present owner={{ selfoss_db_username }}
+  postgresql_db:
+    login_host=localhost
+    login_user={{ db_admin_username }}
+    login_password="{{ db_admin_password }}"
+    name={{ selfoss_db_database }}
+    state=present
+    owner={{ selfoss_db_username }}
 
 - name: Install selfoss config.ini
-  template: src=var_www_selfoss_config.ini.j2 dest=/var/www/selfoss/config.ini group=www-data owner=root mode=0640
+  template:
+    src=var_www_selfoss_config.ini.j2
+    dest=/var/www/selfoss/config.ini
+    owner=root
+    group=www-data
+    mode=0640
 
 - name: Enable Apache rewrite module
   command: a2enmod rewrite creates=/etc/apache2/mods-enabled/rewrite.load
@@ -59,21 +100,34 @@
   command: a2enmod expires creates=/etc/apache2/mods-enabled/expires.load
   notify: restart apache
 
-- name: Rename existing Apache blog virtualhost
-  command: mv /etc/apache2/sites-available/selfoss /etc/apache2/sites-available/selfoss.conf removes=/etc/apache2/sites-available/selfoss
-
-- name: Remove old sites-enabled/selfoss symlink (new one will be created by a2ensite)
-  file: path=/etc/apache2/sites-enabled/selfoss state=absent
+- name: Create the Apache sites config files
+  template:
+    src=etc_apache2_sites-available_selfoss.j2
+    dest=/etc/apache2/sites-available/selfoss_{{ item.name }}.conf
+    owner=root
+    group=root
+  with_items: "{{ virtual_domains }}"
 
-- name: Configure the Apache HTTP server for selfoss
-  template: src=etc_apache2_sites-available_selfoss.j2 dest=/etc/apache2/sites-available/selfoss.conf group=root owner=root
+- name: Remove old sites-enabled symlinks (new ones will be created by a2ensite)
+  file: path=/etc/apache2/sites-enabled/selfoss_{{ item }}.conf state=absent
+  with_items: "{{ virtual_domains | json_query('[*].name') }}"
 
-- name: Enable the selfoss site
-  command: a2ensite selfoss.conf creates=/etc/apache2/sites-enabled/selfoss.conf
+- name: Enable Apache sites (creates new sites-enabled symlinks)
+  command: a2ensite selfoss_{{ item }}.conf creates=/etc/apache2/sites-enabled/selfoss_{{ item }}.conf
   notify: restart apache
+  with_items: "{{ virtual_domains | json_query('[*].name') }}"
 
 - name: Install selfoss cronjob
-  cron: name="selfoss" user="www-data" minute="*/5" job="curl --silent --show-error -k 'https://{{ selfoss_domain }}/update' > /dev/null"
+  cron:
+    name="selfoss"
+    user="www-data"
+    minute="*/5"
+    job="curl --silent --show-error -k 'https://{{ selfoss_domain }}/update' > /dev/null"
 
 - name: Configure selfoss logrotate
-  copy: src=etc_logrotate_selfoss dest=/etc/logrotate.d/selfoss owner=root group=root mode=0644
+  copy:
+    src=etc_logrotate_selfoss
+    dest=/etc/logrotate.d/selfoss
+    owner=root
+    group=root
+    mode=0644

roles/news/templates/etc_apache2_sites-available_selfoss.j2

@@ -1,16 +1,15 @@
 <VirtualHost *:80>
-    ServerName {{ selfoss_domain }}
+    ServerName {{ selfoss_subdomain }}.{{ item.name }}
 
-    Redirect permanent / https://{{ selfoss_domain }}/
+    Redirect permanent / https://{{ selfoss_subdomain }}.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>
-    ServerName {{ selfoss_domain }}
-    SSLEngine On
+    ServerName {{ selfoss_subdomain }}.{{ item.name }}
 
+    SSLEngine               On
     DocumentRoot            /var/www/selfoss
     Options                 -Indexes
-
     ErrorLog                /var/log/apache2/selfoss.info-error_log
     CustomLog               /var/log/apache2/selfoss.info-access_log common
 

roles/news/templates/var_www_selfoss_config.ini.j2

@@ -1,19 +1,20 @@
 ; see https://github.com/SSilence/selfoss/wiki/Configuration for more information about the configuration parameters
 [globals]
 db_type=pgsql
-db_database="{{selfoss_db_database}}"
-db_username="{{selfoss_db_username}}"
-db_password="{{selfoss_db_password}}"
+db_database="{{ selfoss_db_database }}"
+db_username="{{ selfoss_db_username }}"
+db_password="{{ selfoss_db_password }}"
 db_port=5432
 db_prefix=
-logger_level=DEBUG
+; use DEBUG to check for rss fetch errors, INFO to keep log smaller
+logger_level=INFO
 items_perpage=50
 items_lifetime=30
-base_url=
-username={{selfoss_username}}
-password={{selfoss_password_hash}}
+base_url=https://{{ selfoss_domain }}
+username={{ selfoss_username }}
+password={{ selfoss_password_hash }}
 salt=
-public=0
+public=1
 rss_title=selfoss feed
 rss_max_items=1000
 rss_mark_as_read=0
@@ -23,7 +24,7 @@ auto_mark_as_read=1
 anonymizer=
 use_system_font=1
 readability=
-share=gtfprdew
-wallabag=https://read.{{domain}}
+share=gtfprde
+wallabag=
 allow_public_update_access=0
 unread_order=