From 49b7fc7f530c0b1e81d055146d8ebc4e6d8b05f2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Apr 2018 12:19:24 -0400 Subject: [PATCH 1/5] phpMyAdmin 4.7.9 -> 4.8.0.1 --- roles/phpmyadmin/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/phpmyadmin/defaults/main.yml b/roles/phpmyadmin/defaults/main.yml index ae18bd369..dc4a0fd60 100644 --- a/roles/phpmyadmin/defaults/main.yml +++ b/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" From f609ec0efdc271cac0ffbf352d0b5a365959a88e Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Apr 2018 14:43:20 -0400 Subject: [PATCH 2/5] speedup by squashing package installs in ansible.cfg (condenses loop) --- ansible.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible.cfg b/ansible.cfg index c2d5c5593..a2b8d84f7 100644 --- a/ansible.cfg +++ b/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 From 8dcfb7e7ad4ff30cbb0bb0456c79b54668d0dfe7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 21 Apr 2018 19:58:26 -0400 Subject: [PATCH 3/5] Update comment in calibre-install-latest-rpi.sh --- scripts/calibre-install-latest-rpi.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index 8b7bc89c2..941f29306 100755 --- a/scripts/calibre-install-latest-rpi.sh +++ b/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 From 23990aa939bf62e91cfec2a203d8073ed4ab8374 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 26 Apr 2018 09:31:57 -0400 Subject: [PATCH 4/5] dokuwiki 2017-02-19e -> 2018-04-22 --- roles/dokuwiki/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml index a8bc0b97c..67494385f 100644 --- a/roles/dokuwiki/defaults/main.yml +++ b/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" From b516408078c43b78a3fd002a5d879952af33a965 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 26 Apr 2018 09:36:55 -0400 Subject: [PATCH 5/5] symbolic link updating fixed (removed conditional, Ansible approach) --- roles/dokuwiki/tasks/install.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/roles/dokuwiki/tasks/install.yml b/roles/dokuwiki/tasks/install.yml index b3bd11d2a..6bfadbc56 100644 --- a/roles/dokuwiki/tasks/install.yml +++ b/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: