Merge pull request #255 from iiab/master

sync from iiab/iiab
iiab · Jun 4, 2019 · 1051359 · 1051359
2 parents 2e2002e + 39899b6
commit 1051359
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml
@@ -8,12 +8,12 @@
 # https://git.coolaj86.com/coolaj86/gitea-installer.sh
 
 # Information needed to install Gitea
-gitea_version: 1.7.6
+gitea_version: 1.8.2
 iset_suffixes:
   i386: 386
   x86_64: amd64
   armv6l: arm-6
-  armv7l: arm-7
+  armv7l: arm-6   # "arm-7" used to work, but no longer since 2019-04-20's Gitea 1.8.0: https://github.com/iiab/iiab/issues/1673 https://github.com/iiab/iiab/pull/1713
 
 gitea_iset_suffix: "{{ iset_suffixes[ansible_architecture] | default('unknown') }}"
 

diff --git a/roles/phpmyadmin/defaults/main.yml b/roles/phpmyadmin/defaults/main.yml
@@ -1,4 +1,8 @@
-phpmyadmin_install: False
-phpmyadmin_enabled: False
-phpmyadmin_name: "phpMyAdmin-4.8.5-all-languages"
+# phpmyadmin_install: False
+# phpmyadmin_enabled: False
+
+# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
+# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
+
+phpmyadmin_name: "phpMyAdmin-4.9.0.1-all-languages"
 phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"