Merge pull request #73 from iiab/master

sync from iiab/iiab

ansible.cfg

@@ -1,2 +1,5 @@
 # Future overrides of /etc/ansible/ansible.cfg belong in this file.
 # Also used by https://github.com/iiab/iiab-admin-console
+
+[defaults]
+squash_actions = apk, apt, dnf, homebrew, openbsd_pkg, pacman, pkgng, yum, zypper, package

roles/dokuwiki/defaults/main.yml

@@ -1,4 +1,4 @@
 dokuwiki_url: /wiki
 dokuwiki_install: True
 dokuwiki_enabled: False
-dokuwiki_version: "dokuwiki-2017-02-19e"
+dokuwiki_version: "dokuwiki-2018-04-22"

roles/dokuwiki/tasks/install.yml

@@ -11,8 +11,15 @@
     dest: /library
     creates: "/library/{{ dokuwiki_version }}/VERSION"
 
-- name: Symlink /library/dokuwiki* to /library/dokuwiki
-  shell: if [ ! -d /library/dokuwiki ]; then ln -sf /library/{{ dokuwiki_version }} /library/dokuwiki; fi
+- name: Symlink /library/{{ dokuwiki_version }} from /library/dokuwiki
+  #shell: if [ ! -d /library/dokuwiki ]; then ln -sf /library/{{ dokuwiki_version }} /library/dokuwiki; fi
+  #shell: ln -sf /library/{{ dokuwiki_version }} /library/dokuwiki
+  #BOTH LINES ABOVE FAIL TO UPDATE LINK; Ansible approach below works
+  file:
+    path: /library/dokuwiki
+    src: /library/{{ dokuwiki_version }}
+    state: link
+    force: yes
 
 - name: Install config file for DokuWiki in Apache
   template:

roles/phpmyadmin/defaults/main.yml

@@ -1,4 +1,4 @@
 phpmyadmin_install: False
 phpmyadmin_enabled: False
-phpmyadmin_name: "phpMyAdmin-4.7.9-all-languages"
+phpmyadmin_name: "phpMyAdmin-4.8.0.1-all-languages"
 phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"

scripts/calibre-install-latest-rpi.sh

@@ -2,13 +2,14 @@
 
 # Thanks to Jerry Vonau (https://github.com/jvonau) who made
 # this critical breakthrough (Calibre 3.x on Raspbian) possible!
-# The latest available is 3.20 available from testing
+# The latest available is 3.21 available from testing
 # https://packages.debian.org/search?keywords=calibre
-# (SEE http://archive.raspbian.org/raspbian/pool/main/c/calibre/ ?)
-# might break future updates, you have been warned
+# (SEE http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/ 
+#  OR http://archive.raspbian.org/raspbian/pool/main/c/calibre/ ?)
+# Might break future updates, you have been warned.
 
 export DEBIAN_FRONTEND=noninteractive
-# Updates calibre calibre-bin to version 3.20 or ... from testing
+# Updates calibre calibre-bin to version 3.21 or ... from testing
 echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list
 apt update
 apt -y install calibre calibre-bin