From b7151fe047f58312b783df32fabe07729cb52dda Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Jan 2020 01:08:42 -0500 Subject: [PATCH 1/4] Rename var nginx_config_dir to nginx_conf_dir --- roles/awstats/tasks/enable.yml | 8 +++---- roles/calibre-web/tasks/enable.yml | 8 +++---- roles/dokuwiki/tasks/enable.yml | 8 +++---- roles/elgg/tasks/enable.yml | 8 +++---- roles/gitea/tasks/enable.yml | 8 +++---- roles/kiwix/tasks/enable.yml | 8 +++---- roles/kolibri/tasks/enable.yml | 8 +++---- roles/lokole/tasks/enable.yml | 8 +++---- roles/mediawiki/tasks/enable.yml | 8 +++---- roles/moodle/tasks/enable.yml | 8 +++---- roles/munin/tasks/nginx.yml | 8 +++---- roles/nextcloud/tasks/enable.yml | 8 +++---- roles/nginx/defaults/main.yml | 2 +- roles/nginx/tasks/main.yml | 10 ++++---- roles/nginx/tasks/uses_apache.yml.deprecated | 24 ++++++++++---------- roles/nginx/templates/server.conf.j2 | 2 +- roles/nodered/tasks/enable.yml | 8 +++---- roles/osm-vector-maps/tasks/main.yml | 8 +++---- roles/sugarizer/tasks/enable.yml | 8 +++---- roles/wordpress/tasks/nginx.yml | 8 +++---- vars/default_vars.yml | 2 +- 21 files changed, 84 insertions(+), 84 deletions(-) diff --git a/roles/awstats/tasks/enable.yml b/roles/awstats/tasks/enable.yml index 8a4529597..a0278bcf6 100644 --- a/roles/awstats/tasks/enable.yml +++ b/roles/awstats/tasks/enable.yml @@ -16,18 +16,18 @@ # NGINX -- name: Enable http://box/awstats via NGINX, by installing /etc/nginx/cgi-bin.php & {{ nginx_config_dir }}/awstats-nginx.conf from template +- name: Enable http://box/awstats via NGINX, by installing /etc/nginx/cgi-bin.php & {{ nginx_conf_dir }}/awstats-nginx.conf from template template: src: "{{ item.src }}" dest: "{{ item.dest }}" with_items: - - { src: "awstats-nginx.conf", dest: "{{ nginx_config_dir }}/" } + - { src: "awstats-nginx.conf", dest: "{{ nginx_conf_dir }}/" } - { src: "cgi-bin.php", dest: "/etc/nginx/" } when: nginx_install and awstats_enabled -- name: Disable http://box/awstats_url via NGINX, by removing {{ nginx_config_dir }}/awstats-nginx.conf +- name: Disable http://box/awstats_url via NGINX, by removing {{ nginx_conf_dir }}/awstats-nginx.conf file: - path: "{{ nginx_config_dir }}/awstats-nginx.conf" + path: "{{ nginx_conf_dir }}/awstats-nginx.conf" state: absent when: nginx_install and not awstats_enabled diff --git a/roles/calibre-web/tasks/enable.yml b/roles/calibre-web/tasks/enable.yml index 59d4db6cb..6e36672b2 100644 --- a/roles/calibre-web/tasks/enable.yml +++ b/roles/calibre-web/tasks/enable.yml @@ -37,15 +37,15 @@ # TO DO: restore http://box/libros & http://box/livres, along English (http://box/books) -- name: Enable http://box{{ calibreweb_url1 }} via NGINX, by installing {{ nginx_config_dir }}/calibre-web-nginx.conf from template +- name: Enable http://box{{ calibreweb_url1 }} via NGINX, by installing {{ nginx_conf_dir }}/calibre-web-nginx.conf from template template: src: calibre-web-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/calibre-web-nginx.conf" + dest: "{{ nginx_conf_dir }}/calibre-web-nginx.conf" when: nginx_install and calibreweb_enabled -- name: Disable http://box{{ calibreweb_url1 }} via NGINX, by removing {{ nginx_config_dir }}/calibre-web-nginx.conf +- name: Disable http://box{{ calibreweb_url1 }} via NGINX, by removing {{ nginx_conf_dir }}/calibre-web-nginx.conf file: - path: "{{ nginx_config_dir }}/calibre-web-nginx.conf" + path: "{{ nginx_conf_dir }}/calibre-web-nginx.conf" state: absent when: nginx_install and not calibreweb_enabled diff --git a/roles/dokuwiki/tasks/enable.yml b/roles/dokuwiki/tasks/enable.yml index 55df3cfae..45e08a407 100644 --- a/roles/dokuwiki/tasks/enable.yml +++ b/roles/dokuwiki/tasks/enable.yml @@ -16,15 +16,15 @@ # NGINX -- name: "SHIM: Enable http://box{{ dokuwiki_url }} via NGINX, by installing {{ nginx_config_dir }}/dokuwiki-nginx.conf from template" # http://box/dokuwiki +- name: "SHIM: Enable http://box{{ dokuwiki_url }} via NGINX, by installing {{ nginx_conf_dir }}/dokuwiki-nginx.conf from template" # http://box/dokuwiki template: src: dokuwiki-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/dokuwiki-nginx.conf" + dest: "{{ nginx_conf_dir }}/dokuwiki-nginx.conf" when: nginx_install and dokuwiki_enabled -- name: "SHIM: Disable http://box{{ dokuwiki_url }} via NGINX, by removing {{ nginx_config_dir }}/dokuwiki-nginx.conf" # http://box/dokuwiki +- name: "SHIM: Disable http://box{{ dokuwiki_url }} via NGINX, by removing {{ nginx_conf_dir }}/dokuwiki-nginx.conf" # http://box/dokuwiki file: - path: "{{ nginx_config_dir }}/dokuwiki-nginx.conf" + path: "{{ nginx_conf_dir }}/dokuwiki-nginx.conf" state: absent when: nginx_install and not dokuwiki_enabled diff --git a/roles/elgg/tasks/enable.yml b/roles/elgg/tasks/enable.yml index e28c84323..249ab6de0 100644 --- a/roles/elgg/tasks/enable.yml +++ b/roles/elgg/tasks/enable.yml @@ -16,15 +16,15 @@ # NGINX -- name: "SHIM: Enable http://box{{ elgg_url }} via NGINX, by installing {{ nginx_config_dir }}/elgg-nginx.conf from template" # http://box/elgg +- name: "SHIM: Enable http://box{{ elgg_url }} via NGINX, by installing {{ nginx_conf_dir }}/elgg-nginx.conf from template" # http://box/elgg template: src: elgg-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/elgg-nginx.conf" + dest: "{{ nginx_conf_dir }}/elgg-nginx.conf" when: nginx_install and elgg_enabled -- name: "SHIM: Disable http://box{{ elgg_url }} via NGINX, by removing {{ nginx_config_dir }}/elgg-nginx.conf" # http://box/elgg +- name: "SHIM: Disable http://box{{ elgg_url }} via NGINX, by removing {{ nginx_conf_dir }}/elgg-nginx.conf" # http://box/elgg file: - path: "{{ nginx_config_dir }}/elgg-nginx.conf" + path: "{{ nginx_conf_dir }}/elgg-nginx.conf" state: absent when: nginx_install and not elgg_enabled diff --git a/roles/gitea/tasks/enable.yml b/roles/gitea/tasks/enable.yml index 5b706a14e..925f5c041 100644 --- a/roles/gitea/tasks/enable.yml +++ b/roles/gitea/tasks/enable.yml @@ -31,15 +31,15 @@ # NGINX -- name: Enable http://box{{ gitea_url }} via NGINX, by installing {{ nginx_config_dir }}/gitea-nginx.conf from template +- name: Enable http://box{{ gitea_url }} via NGINX, by installing {{ nginx_conf_dir }}/gitea-nginx.conf from template template: src: gitea-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/gitea-nginx.conf" + dest: "{{ nginx_conf_dir }}/gitea-nginx.conf" when: nginx_install and gitea_enabled -- name: Disable http://box{{ gitea_url }} via NGINX, by removing {{ nginx_config_dir }}/gitea-nginx.conf +- name: Disable http://box{{ gitea_url }} via NGINX, by removing {{ nginx_conf_dir }}/gitea-nginx.conf file: - path: "{{ nginx_config_dir }}/gitea-nginx.conf" + path: "{{ nginx_conf_dir }}/gitea-nginx.conf" state: absent when: nginx_install and not gitea_enabled diff --git a/roles/kiwix/tasks/enable.yml b/roles/kiwix/tasks/enable.yml index 0fa9519e4..f4fff7ca2 100644 --- a/roles/kiwix/tasks/enable.yml +++ b/roles/kiwix/tasks/enable.yml @@ -53,15 +53,15 @@ # NGINX -- name: Enable http://box{{ kiwix_url_without_slash }} via NGINX, by installing {{ nginx_config_dir }}/kiwix-nginx.conf from template +- name: Enable http://box{{ kiwix_url_without_slash }} via NGINX, by installing {{ nginx_conf_dir }}/kiwix-nginx.conf from template template: src: kiwix-nginx.conf - dest: "{{ nginx_config_dir }}/kiwix-nginx.conf" + dest: "{{ nginx_conf_dir }}/kiwix-nginx.conf" when: nginx_install and kiwix_enabled -- name: Disable http://box{{ kiwix_url_without_slash }} via NGINX, by removing {{ nginx_config_dir }}/kiwix-nginx.conf +- name: Disable http://box{{ kiwix_url_without_slash }} via NGINX, by removing {{ nginx_conf_dir }}/kiwix-nginx.conf file: - path: "{{ nginx_config_dir }}/kiwix-nginx.conf" + path: "{{ nginx_conf_dir }}/kiwix-nginx.conf" state: absent when: nginx_install and not kiwix_enabled diff --git a/roles/kolibri/tasks/enable.yml b/roles/kolibri/tasks/enable.yml index 0bbd088b0..7395628fe 100644 --- a/roles/kolibri/tasks/enable.yml +++ b/roles/kolibri/tasks/enable.yml @@ -31,15 +31,15 @@ # NGINX -- name: Enable http://box{{ kolibri_url }} via NGINX, by installing {{ nginx_config_dir }}/kolibri-nginx.conf from template +- name: Enable http://box{{ kolibri_url }} via NGINX, by installing {{ nginx_conf_dir }}/kolibri-nginx.conf from template template: src: kolibri-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/kolibri-nginx.conf" + dest: "{{ nginx_conf_dir }}/kolibri-nginx.conf" when: nginx_install and kolibri_enabled -- name: Disable http://box{{ kolibri_url }} via NGINX, by removing {{ nginx_config_dir }}/kolibri-nginx.conf +- name: Disable http://box{{ kolibri_url }} via NGINX, by removing {{ nginx_conf_dir }}/kolibri-nginx.conf file: - path: "{{ nginx_config_dir }}/kolibri-nginx.conf" + path: "{{ nginx_conf_dir }}/kolibri-nginx.conf" state: absent when: nginx_install and not kolibri_enabled diff --git a/roles/lokole/tasks/enable.yml b/roles/lokole/tasks/enable.yml index 981925e85..a8701376c 100644 --- a/roles/lokole/tasks/enable.yml +++ b/roles/lokole/tasks/enable.yml @@ -31,15 +31,15 @@ # NGINX -- name: "SHIM: Enable http://box{{ lokole_url }} via NGINX, by installing {{ nginx_config_dir }}/lokole-nginx.conf from template" # http://box/lokole +- name: "SHIM: Enable http://box{{ lokole_url }} via NGINX, by installing {{ nginx_conf_dir }}/lokole-nginx.conf from template" # http://box/lokole template: src: lokole-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/lokole-nginx.conf" + dest: "{{ nginx_conf_dir }}/lokole-nginx.conf" when: nginx_install and lokole_enabled -- name: "SHIM: Disable http://box{{ lokole_url }} via NGINX, by removing {{ nginx_config_dir }}/lokole-nginx.conf" # http://box/lokole +- name: "SHIM: Disable http://box{{ lokole_url }} via NGINX, by removing {{ nginx_conf_dir }}/lokole-nginx.conf" # http://box/lokole file: - path: "{{ nginx_config_dir }}/lokole-nginx.conf" + path: "{{ nginx_conf_dir }}/lokole-nginx.conf" state: absent when: nginx_install and not lokole_enabled diff --git a/roles/mediawiki/tasks/enable.yml b/roles/mediawiki/tasks/enable.yml index 5f531f697..d086b7193 100644 --- a/roles/mediawiki/tasks/enable.yml +++ b/roles/mediawiki/tasks/enable.yml @@ -16,15 +16,15 @@ # NGINX -- name: Enable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by installing {{ nginx_config_dir }}/mediawiki-nginx.conf from template +- name: Enable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by installing {{ nginx_conf_dir }}/mediawiki-nginx.conf from template template: src: mediawiki-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/mediawiki-nginx.conf" + dest: "{{ nginx_conf_dir }}/mediawiki-nginx.conf" when: nginx_install and mediawiki_enabled -- name: Disable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by removing {{ nginx_config_dir }}/mediawiki-nginx.conf +- name: Disable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by removing {{ nginx_conf_dir }}/mediawiki-nginx.conf file: - path: "{{ nginx_config_dir }}/mediawiki-nginx.conf" + path: "{{ nginx_conf_dir }}/mediawiki-nginx.conf" state: absent when: nginx_install and not mediawiki_enabled diff --git a/roles/moodle/tasks/enable.yml b/roles/moodle/tasks/enable.yml index c0afc6ca0..36f211c60 100644 --- a/roles/moodle/tasks/enable.yml +++ b/roles/moodle/tasks/enable.yml @@ -31,15 +31,15 @@ # NGINX -- name: Enable http://box/moodle via NGINX, by installing {{ nginx_config_dir }}/moodle-nginx.conf from template +- name: Enable http://box/moodle via NGINX, by installing {{ nginx_conf_dir }}/moodle-nginx.conf from template template: src: moodle-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/moodle-nginx.conf" + dest: "{{ nginx_conf_dir }}/moodle-nginx.conf" when: nginx_install and moodle_enabled -- name: Disable http://box/moodle via NGINX, by removing {{ nginx_config_dir }}/moodle-nginx.conf +- name: Disable http://box/moodle via NGINX, by removing {{ nginx_conf_dir }}/moodle-nginx.conf file: - path: "{{ nginx_config_dir }}/moodle-nginx.conf" + path: "{{ nginx_conf_dir }}/moodle-nginx.conf" state: absent when: nginx_install and not moodle_enabled diff --git a/roles/munin/tasks/nginx.yml b/roles/munin/tasks/nginx.yml index cbe4286bc..cd1094451 100644 --- a/roles/munin/tasks/nginx.yml +++ b/roles/munin/tasks/nginx.yml @@ -1,12 +1,12 @@ -- name: Enable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf from template +- name: Enable http://box/munin via NGINX, by installing {{ nginx_conf_dir }}/munin24-nginx.conf from template template: src: munin24-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d when: munin_enabled -- name: Disable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf +- name: Disable http://box/munin via NGINX, by installing {{ nginx_conf_dir }}/munin24-nginx.conf file: - path: "{{ nginx_config_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d + path: "{{ nginx_conf_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d state: absent when: not munin_enabled diff --git a/roles/nextcloud/tasks/enable.yml b/roles/nextcloud/tasks/enable.yml index 332669c8e..2170bc9a9 100644 --- a/roles/nextcloud/tasks/enable.yml +++ b/roles/nextcloud/tasks/enable.yml @@ -16,15 +16,15 @@ # NGINX -- name: "SHIM: Enable http://box{{ nextcloud_url }} via NGINX, by installing {{ nginx_config_dir }}/nextcloud-nginx.conf from template" # http://box/nextcloud +- name: "SHIM: Enable http://box{{ nextcloud_url }} via NGINX, by installing {{ nginx_conf_dir }}/nextcloud-nginx.conf from template" # http://box/nextcloud template: src: nextcloud-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/nextcloud-nginx.conf" + dest: "{{ nginx_conf_dir }}/nextcloud-nginx.conf" when: nginx_install and nextcloud_enabled -- name: "SHIM: Disable http://box{{ nextcloud_url }} via NGINX, by removing {{ nginx_config_dir }}/nextcloud-nginx.conf" # http://box/nextcloud +- name: "SHIM: Disable http://box{{ nextcloud_url }} via NGINX, by removing {{ nginx_conf_dir }}/nextcloud-nginx.conf" # http://box/nextcloud file: - path: "{{ nginx_config_dir }}/nextcloud-nginx.conf" + path: "{{ nginx_conf_dir }}/nextcloud-nginx.conf" state: absent when: nginx_install and not nextcloud_enabled diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index e9974baca..c7d736510 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -7,7 +7,7 @@ # nginx_port: 80 # nginx_interface: 0.0.0.0 -# nginx_config_dir: /etc/nginx/conf.d +# nginx_conf_dir: /etc/nginx/conf.d # nginx_log_dir: /var/log/nginx # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index d2f57ffe3..567459612 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -1,18 +1,18 @@ -- name: Remove stale files (usb-lib.conf, modules.conf) from {{ nginx_config_dir }} +- name: Remove stale files (usb-lib.conf, modules.conf) from {{ nginx_conf_dir }} file: path: "{{ item.path }}" state: absent with_items: - { path: "/etc/systemd/system/uwsgi.service" } - - { path: "{{ nginx_config_dir }}/usb-lib.conf" } - - { path: "{{ nginx_config_dir }}/modules.conf" } + - { path: "{{ nginx_conf_dir }}/usb-lib.conf" } + - { path: "{{ nginx_conf_dir }}/modules.conf" } - name: Ensure that Apache (({{ apache_service }})) is not running -- we may need port swap systemd: name: "{{ apache_service }}" state: stopped -- name: "Install from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/{{ apache_service }}/ports.conf, {{ nginx_config_dir }}/iiab.conf" +- name: "Install from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/{{ apache_service }}/ports.conf, {{ nginx_conf_dir }}/iiab.conf" template: src: "{{ item.src}}" dest: "{{ item.dest }}" @@ -20,7 +20,7 @@ - { src: 'server.conf.j2', dest: '/etc/nginx/server.conf' } - { src: 'nginx.conf.j2', dest: '/etc/nginx/nginx.conf' } - { src: 'ports.conf.j2', dest: "/etc/{{ apache_service }}/ports.conf" } - - { src: 'iiab.conf.j2', dest: "{{ nginx_config_dir }}/iiab.conf" } + - { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" } when: nginx_enabled | bool # the below slides in nginx's proxypass config files for apache on localhost diff --git a/roles/nginx/tasks/uses_apache.yml.deprecated b/roles/nginx/tasks/uses_apache.yml.deprecated index 8c679b5e2..6a6356ad9 100644 --- a/roles/nginx/tasks/uses_apache.yml.deprecated +++ b/roles/nginx/tasks/uses_apache.yml.deprecated @@ -2,40 +2,40 @@ # for these 6 playbooks. Any way PR #2131 etc can help reduce duplication? -- name: Install {{ nginx_config_dir }}/dokuwiki-nginx.conf from template, if dokuwiki_enabled +- name: Install {{ nginx_conf_dir }}/dokuwiki-nginx.conf from template, if dokuwiki_enabled template: src: dokuwiki-nginx.conf - dest: "{{ nginx_config_dir }}/dokuwiki-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/dokuwiki-nginx.conf" # /etc/nginx/conf.d when: dokuwiki_enabled | bool -- name: Install {{ nginx_config_dir }}/elgg-nginx.conf from template, if elgg_enabled +- name: Install {{ nginx_conf_dir }}/elgg-nginx.conf from template, if elgg_enabled template: src: elgg-nginx.conf - dest: "{{ nginx_config_dir }}/elgg-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/elgg-nginx.conf" # /etc/nginx/conf.d when: elgg_enabled | bool -- name: Install {{ nginx_config_dir }}/lokole-nginx.conf from template, if lokole_enabled +- name: Install {{ nginx_conf_dir }}/lokole-nginx.conf from template, if lokole_enabled template: src: lokole-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/lokole-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/lokole-nginx.conf" # /etc/nginx/conf.d when: lokole_enabled | bool -- name: Install {{ nginx_config_dir }}/moodle-nginx.conf from template, if moodle_enabled +- name: Install {{ nginx_conf_dir }}/moodle-nginx.conf from template, if moodle_enabled template: src: moodle-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/moodle-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/moodle-nginx.conf" # /etc/nginx/conf.d when: moodle_enabled | bool -- name: Install {{ nginx_config_dir }}/nextcloud-nginx.conf from template, if nextcloud_enabled +- name: Install {{ nginx_conf_dir }}/nextcloud-nginx.conf from template, if nextcloud_enabled template: src: nextcloud-nginx.conf - dest: "{{ nginx_config_dir }}/nextcloud-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/nextcloud-nginx.conf" # /etc/nginx/conf.d when: nextcloud_enabled | bool -- name: Install {{ nginx_config_dir }}/nodered-nginx.conf from template, if nodered_enabled +- name: Install {{ nginx_conf_dir }}/nodered-nginx.conf from template, if nodered_enabled template: src: nodered-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/nodered-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/nodered-nginx.conf" # /etc/nginx/conf.d # mode: '0666' when: nodered_enabled | bool diff --git a/roles/nginx/templates/server.conf.j2 b/roles/nginx/templates/server.conf.j2 index 4a8c7a6a1..6b42b1c14 100644 --- a/roles/nginx/templates/server.conf.j2 +++ b/roles/nginx/templates/server.conf.j2 @@ -6,7 +6,7 @@ server { index index.php index.html index.htm; # let individual services drop location blocks in conf.d - include {{ nginx_config_dir }}/*; + include {{ nginx_conf_dir }}/*; location ~ .*\.php$ { proxy_set_header X-Real-IP $remote_addr; diff --git a/roles/nodered/tasks/enable.yml b/roles/nodered/tasks/enable.yml index a6ba2d28c..d6eb9dba8 100644 --- a/roles/nodered/tasks/enable.yml +++ b/roles/nodered/tasks/enable.yml @@ -31,16 +31,16 @@ # NGINX -- name: "SHIM: Enable http://box/nodered_url via NGINX, by installing {{ nginx_config_dir }}/nodered-nginx.conf from template" +- name: "SHIM: Enable http://box/nodered_url via NGINX, by installing {{ nginx_conf_dir }}/nodered-nginx.conf from template" template: src: nodered-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/nodered-nginx.conf" + dest: "{{ nginx_conf_dir }}/nodered-nginx.conf" # mode: '0666' when: nginx_install and nodered_enabled -- name: "SHIM: Disable http://box/nodered_url via NGINX, by removing {{ nginx_config_dir }}/nodered-nginx.conf" +- name: "SHIM: Disable http://box/nodered_url via NGINX, by removing {{ nginx_conf_dir }}/nodered-nginx.conf" file: - path: "{{ nginx_config_dir }}/nodered-nginx.conf" + path: "{{ nginx_conf_dir }}/nodered-nginx.conf" state: absent when: nginx_install and not nodered_enabled diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index c6e53b3ae..b2b0c92ba 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/roles/osm-vector-maps/tasks/main.yml @@ -69,15 +69,15 @@ src: map_functions.js dest: "{{ vector_map_path }}/maplist/assets" -- name: Install {{ nginx_config_dir }}/osm-vector-maps.conf from template +- name: Install {{ nginx_conf_dir }}/osm-vector-maps.conf from template template: src: osm-vector-maps-nginx.conf - dest: "{{ nginx_config_dir }}/osm-vector-maps-nginx.conf" + dest: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf" when: osm_vector_maps_enabled | bool -- name: Remove {{ nginx_config_dir }}/osm-vector-maps.conf +- name: Remove {{ nginx_conf_dir }}/osm-vector-maps.conf file: - path: "{{ nginx_config_dir }}/osm-vector-maps-nginx.conf" + path: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf" state: absent when: not osm_vector_maps_enabled diff --git a/roles/sugarizer/tasks/enable.yml b/roles/sugarizer/tasks/enable.yml index e8b423540..37969819b 100644 --- a/roles/sugarizer/tasks/enable.yml +++ b/roles/sugarizer/tasks/enable.yml @@ -38,15 +38,15 @@ # NGINX -- name: Enable http://box/sugarizer via NGINX, by installing {{ nginx_config_dir }}/sugarizer-nginx.conf from template +- name: Enable http://box/sugarizer via NGINX, by installing {{ nginx_conf_dir }}/sugarizer-nginx.conf from template template: src: sugarizer-nginx.conf - dest: "{{ nginx_config_dir }}/sugarizer-nginx.conf" + dest: "{{ nginx_conf_dir }}/sugarizer-nginx.conf" when: nginx_install and sugarizer_enabled -- name: Disable http://box/sugarizer via NGINX, by removing {{ nginx_config_dir }}/sugarizer-nginx.conf +- name: Disable http://box/sugarizer via NGINX, by removing {{ nginx_conf_dir }}/sugarizer-nginx.conf file: - path: "{{ nginx_config_dir }}/sugarizer-nginx.conf" + path: "{{ nginx_conf_dir }}/sugarizer-nginx.conf" state: absent when: nginx_install and not sugarizer_enabled diff --git a/roles/wordpress/tasks/nginx.yml b/roles/wordpress/tasks/nginx.yml index 13058fbcc..348d06f45 100644 --- a/roles/wordpress/tasks/nginx.yml +++ b/roles/wordpress/tasks/nginx.yml @@ -1,12 +1,12 @@ -- name: Enable http://box{{ wp_url }} via NGINX, by installing {{ nginx_config_dir }}/wordpress-nginx.conf from template +- name: Enable http://box{{ wp_url }} via NGINX, by installing {{ nginx_conf_dir }}/wordpress-nginx.conf from template template: src: wordpress-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d when: wordpress_enabled -- name: Disable http://box{{ wp_url }} via NGINX, by removing {{ nginx_config_dir }}/wordpress-nginx.conf +- name: Disable http://box{{ wp_url }} via NGINX, by removing {{ nginx_conf_dir }}/wordpress-nginx.conf file: - path: "{{ nginx_config_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d + path: "{{ nginx_conf_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d state: absent when: not wordpress_enabled diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 230a3a449..7025ed4d5 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -243,7 +243,7 @@ nginx_install: True nginx_enabled: True nginx_port: 80 nginx_interface: 0.0.0.0 -nginx_config_dir: /etc/nginx/conf.d +nginx_conf_dir: /etc/nginx/conf.d nginx_log_dir: /var/log/nginx # See also Apache vars {default_language, language_priority} @ top of this file From 2e97f1bad45bd46088f0fe6db22d41f02f5fbe22 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Jan 2020 01:41:18 -0500 Subject: [PATCH 2/4] Clean {MIN, MEDIUM, BIG} local_vars.yml files --- vars/local_vars_big.yml | 35 +++++++++++++++++------------------ vars/local_vars_medium.yml | 35 +++++++++++++++++------------------ vars/local_vars_min.yml | 33 ++++++++++++++++----------------- 3 files changed, 50 insertions(+), 53 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index c0a2c2b4a..9f6e9e9fb 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -36,7 +36,7 @@ iiab_domain: lan iiab_home_url: /home # You might also want to set captiveportal_splash_page (below!) -# Raspbian requires WiFi country since March 2018. Please set it here: +# Raspbian requires Wi-Fi country since March 2018. Please set it here: host_country_code: US host_ssid: "Internet in a Box" host_wifi_mode: g @@ -101,7 +101,7 @@ bluetooth_term_enabled: False # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu) js_menu_install: True -# Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382 +# UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382 # wondershaper_install: False # wondershaper_enabled: False @@ -164,14 +164,6 @@ squid_enabled: False dansguardian_install: False dansguardian_enabled: False -# PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! -postgresql_install: False -postgresql_enabled: False - -# Unmaintained -# authserver_install: False -# authserver_enabled: False - # Common UNIX Printing System (CUPS) cups_install: True cups_enabled: True @@ -189,17 +181,20 @@ iiab_usb_lib_show_all: True # Lesser-supported XO services need additional testing. Please contact # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test. +# UNMAINTAINED # xo_services_install: False # xo_services_enabled: False +# UNMAINTAINED # activity_server_install: False # activity_server_enabled: False +# UNMAINTAINED # Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below # ejabberd_xs_install: False # ejabberd_xs_enabled: False -# UNMAINTAINED since about 2012-2017 +# UNMAINTAINED # Change calibre_port from 8080 to 8010 below, if you enable idmgr # idmgr_install: False # idmgr_enabled: False @@ -210,11 +205,11 @@ iiab_usb_lib_show_all: True azuracast_install: False azuracast_enabled: False -# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056 +# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056 dokuwiki_install: False dokuwiki_enabled: False -# Unmaintained as of November 2019 +# UNMAINTAINED as of November 2019 ejabberd_install: False ejabberd_enabled: False @@ -379,11 +374,15 @@ calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web # 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_* # 2018: http://download.iiab.io/content/OSM/vector-tiles/ # 2017: http://oer2go.org/viewmod/en-worldmap-10 -# -# Unmaintained -# osm_install: False -# osm_enabled: False -# Unmaintained +# UNMAINTAINED +# authserver_install: False +# authserver_enabled: False + +# UNMAINTAINED # docker_install: False # docker_enabled: False + +# UNMAINTAINED +# osm_install: False +# osm_enabled: False diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 1a6591d5f..75e424c17 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -36,7 +36,7 @@ iiab_domain: lan iiab_home_url: /home # You might also want to set captiveportal_splash_page (below!) -# Raspbian requires WiFi country since March 2018. Please set it here: +# Raspbian requires Wi-Fi country since March 2018. Please set it here: host_country_code: US host_ssid: "Internet in a Box" host_wifi_mode: g @@ -101,7 +101,7 @@ bluetooth_term_enabled: False # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu) js_menu_install: True -# Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382 +# UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382 # wondershaper_install: False # wondershaper_enabled: False @@ -164,14 +164,6 @@ squid_enabled: False dansguardian_install: False dansguardian_enabled: False -# PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! -postgresql_install: False -postgresql_enabled: False - -# Unmaintained -# authserver_install: False -# authserver_enabled: False - # Common UNIX Printing System (CUPS) cups_install: False cups_enabled: False @@ -189,17 +181,20 @@ iiab_usb_lib_show_all: True # Lesser-supported XO services need additional testing. Please contact # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test. +# UNMAINTAINED # xo_services_install: False # xo_services_enabled: False +# UNMAINTAINED # activity_server_install: False # activity_server_enabled: False +# UNMAINTAINED # Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below # ejabberd_xs_install: False # ejabberd_xs_enabled: False -# UNMAINTAINED since about 2012-2017 +# UNMAINTAINED # Change calibre_port from 8080 to 8010 below, if you enable idmgr # idmgr_install: False # idmgr_enabled: False @@ -210,11 +205,11 @@ iiab_usb_lib_show_all: True azuracast_install: False azuracast_enabled: False -# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056 +# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056 dokuwiki_install: False dokuwiki_enabled: False -# Unmaintained as of November 2019 +# UNMAINTAINED as of November 2019 ejabberd_install: False ejabberd_enabled: False @@ -379,11 +374,15 @@ calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web # 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_* # 2018: http://download.iiab.io/content/OSM/vector-tiles/ # 2017: http://oer2go.org/viewmod/en-worldmap-10 -# -# Unmaintained -# osm_install: False -# osm_enabled: False -# Unmaintained +# UNMAINTAINED +# authserver_install: False +# authserver_enabled: False + +# UNMAINTAINED # docker_install: False # docker_enabled: False + +# UNMAINTAINED +# osm_install: False +# osm_enabled: False diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 6f709a265..408306a32 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -101,7 +101,7 @@ bluetooth_term_enabled: False # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu) js_menu_install: True -# Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382 +# UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382 # wondershaper_install: False # wondershaper_enabled: False @@ -164,14 +164,6 @@ squid_enabled: False dansguardian_install: False dansguardian_enabled: False -# PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! -postgresql_install: False -postgresql_enabled: False - -# Unmaintained -# authserver_install: False -# authserver_enabled: False - # Common UNIX Printing System (CUPS) cups_install: False cups_enabled: False @@ -189,17 +181,20 @@ iiab_usb_lib_show_all: True # Lesser-supported XO services need additional testing. Please contact # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test. +# UNMAINTAINED # xo_services_install: False # xo_services_enabled: False +# UNMAINTAINED # activity_server_install: False # activity_server_enabled: False +# UNMAINTAINED # Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below # ejabberd_xs_install: False # ejabberd_xs_enabled: False -# UNMAINTAINED since about 2012-2017 +# UNMAINTAINED # Change calibre_port from 8080 to 8010 below, if you enable idmgr # idmgr_install: False # idmgr_enabled: False @@ -210,11 +205,11 @@ iiab_usb_lib_show_all: True azuracast_install: False azuracast_enabled: False -# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056 +# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056 dokuwiki_install: False dokuwiki_enabled: False -# Unmaintained as of November 2019 +# UNMAINTAINED as of November 2019 ejabberd_install: False ejabberd_enabled: False @@ -379,11 +374,15 @@ calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web # 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_* # 2018: http://download.iiab.io/content/OSM/vector-tiles/ # 2017: http://oer2go.org/viewmod/en-worldmap-10 -# -# Unmaintained -# osm_install: False -# osm_enabled: False -# Unmaintained +# UNMAINTAINED +# authserver_install: False +# authserver_enabled: False + +# UNMAINTAINED # docker_install: False # docker_enabled: False + +# UNMAINTAINED +# osm_install: False +# osm_enabled: False From 2218d2334b0e4d968e69232853752c6bf66bf506 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Jan 2020 02:27:21 -0500 Subject: [PATCH 3/4] Move 19 roles into roles/0-DEPRECATED-ROLES --- iiab-install | 2 +- roles/{ => 0-DEPRECATED-ROLES}/activity-server/README.rst | 0 .../activity-server/defaults/main.yml | 0 .../activity-server/files/bin/xs-check-activities | 0 .../activity-server/files/bin/xs-regenerate-activities | 0 .../activity-server/files/lang_templates/en/activity | 0 .../activity-server/files/lang_templates/en/page | 0 .../activity-server/files/lang_templates/es/activity | 0 .../activity-server/files/lang_templates/es/page | 0 .../activity-server/files/lang_templates/fr/activity | 0 .../activity-server/files/lang_templates/fr/page | 0 .../activity-server/files/lang_templates/ht/activity | 0 .../activity-server/files/lang_templates/ht/page | 0 .../activity-server/files/www.0/index.html.en | 0 .../activity-server/files/www.0/index.html.fr | 0 .../activity-server/files/www.0/index.html.ht | 0 .../activity-server/files/xs_activities/__init__.py | 0 roles/{ => 0-DEPRECATED-ROLES}/activity-server/tasks/main.yml | 0 .../templates/usbmount-60-xs-activity-server-installcontent | 0 .../activity-server/templates/xs-activity-server.conf | 0 roles/{ => 0-DEPRECATED-ROLES}/ajenti/handlers/main.yml | 0 .../ajenti/tasks/ajenti-wondershaper.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/ajenti/tasks/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/authserver/tasks/main.yml | 0 .../authserver/templates/xs-authserver.env.j2 | 0 .../authserver/templates/xs-authserver.service.j2 | 0 .../debian_schooltool/defaults/main.yml | 0 .../{ => 0-DEPRECATED-ROLES}/debian_schooltool/tasks/main.yml | 0 .../debian_schooltool/templates/buildout.cfg | 0 roles/{ => 0-DEPRECATED-ROLES}/docker/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/docker/tasks/main.yml | 0 .../{ => 0-DEPRECATED-ROLES}/docker/templates/docker.service | 0 roles/{ => 0-DEPRECATED-ROLES}/docker/templates/docker.socket | 0 roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/README.rst | 0 roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/tasks/enable.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/tasks/install.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/tasks/main.yml | 0 .../dokuwiki/templates/dokuwiki-nginx.conf.j2 | 0 .../dokuwiki/templates/dokuwiki.conf.j2 | 0 roles/{ => 0-DEPRECATED-ROLES}/ejabberd/tasks/main.yml | 0 .../ejabberd/templates/10-ejabberdmoodle | 0 roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberd | 0 .../{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberd-iiab | 0 .../ejabberd/templates/ejabberd-iiab.cfg.j2 | 0 .../ejabberd/templates/ejabberd-iiab.init | 0 .../ejabberd/templates/ejabberd-iiab.service.j2 | 0 .../ejabberd/templates/ejabberd.tmpfiles | 0 .../ejabberd/templates/ejabberdctl.cfg.j2 | 0 .../ejabberd/templates/iiab-ejabberd-srg | 0 roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/tasks/main.yml | 0 .../ejabberd_xs/templates/10-ejabberdmoodle | 0 roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/ejabberd | 0 .../ejabberd_xs/templates/ejabberd-xs | 0 .../ejabberd_xs/templates/ejabberd-xs.cfg.j2 | 0 .../ejabberd_xs/templates/ejabberd-xs.init | 0 .../ejabberd_xs/templates/ejabberd-xs.service.j2 | 0 .../ejabberd_xs/templates/ejabberd.tmpfiles | 0 .../ejabberd_xs/templates/ejabberdctl.cfg.j2 | 0 .../ejabberd_xs/templates/xs-ejabberd-srg | 0 roles/{ => 0-DEPRECATED-ROLES}/idmgr/tasks/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/idmgr/templates/idmgr | 0 .../{ => 0-DEPRECATED-ROLES}/idmgr/templates/idmgr.service.j2 | 0 .../{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/meta/main.yml | 0 .../{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/tasks/main.yml | 0 .../moodle-1.9/moodle/templates/020-iiab-moodle.conf.j2 | 0 .../moodle-1.9/moodle/templates/020-xsce-moodle.conf.j2 | 0 .../moodle-1.9/moodle/templates/moodle-xs-init | 0 .../moodle-1.9/moodle/templates/moodle-xs.service.in | 0 .../moodle-1.9/moodle/templates/moodle-xs.service.j2 | 0 roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/tasks/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/tasks/rpi.yml | 0 .../nodogsplash/templates/nodogsplash.conf.j2 | 0 .../nodogsplash/templates/nodogsplash.service.j2 | 0 .../nodogsplash/templates/splash.html.j2 | 0 roles/{ => 0-DEPRECATED-ROLES}/osm/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/osm/tasks/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/osm/templates/defaults.ini | 0 roles/{ => 0-DEPRECATED-ROLES}/osm/templates/etc.iiab.conf | 0 .../osm/templates/l.control.geosearch.js | 0 roles/{ => 0-DEPRECATED-ROLES}/osm/templates/map.html | 0 roles/{ => 0-DEPRECATED-ROLES}/osm/templates/map_search.py | 0 roles/{ => 0-DEPRECATED-ROLES}/osm/templates/osm.conf.j2 | 0 roles/{ => 0-DEPRECATED-ROLES}/osm/templates/osm.repo | 0 roles/{ => 0-DEPRECATED-ROLES}/owncloud/README.rst | 0 roles/{ => 0-DEPRECATED-ROLES}/owncloud/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/owncloud/tasks/F18.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/owncloud/tasks/main.yml | 0 .../owncloud/tasks/owncloud_enabled.yml | 0 .../owncloud/templates/autoconfig.php.j2 | 0 .../owncloud/templates/owncloud.conf.j2 | 0 .../{ => 0-DEPRECATED-ROLES}/owncloud/templates/owncloud.list | 0 roles/{ => 0-DEPRECATED-ROLES}/pathagar/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/pathagar/tasks/main.yml | 0 .../pathagar/templates/auth.User.json | 0 .../{ => 0-DEPRECATED-ROLES}/pathagar/templates/pathagar.conf | 0 .../pathagar/templates/prod_settings.py | 0 roles/{ => 0-DEPRECATED-ROLES}/pathagar/templates/wsgi.py | 0 roles/{ => 0-DEPRECATED-ROLES}/rachel/README.rst | 0 roles/{ => 0-DEPRECATED-ROLES}/rachel/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/rachel/tasks/main.yml | 0 .../{ => 0-DEPRECATED-ROLES}/rachel/tasks/rachel_enabled.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/rachel/templates/footer.html | 0 roles/{ => 0-DEPRECATED-ROLES}/rachel/templates/header.html | 0 .../{ => 0-DEPRECATED-ROLES}/rachel/templates/rachel.conf.j2 | 0 roles/{ => 0-DEPRECATED-ROLES}/schooltool/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/schooltool/meta/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/schooltool/tasks/main.yml | 0 .../schooltool/templates/schooltool.conf | 0 .../schooltool/templates/schooltool.service | 0 roles/{ => 0-DEPRECATED-ROLES}/sugar-stats/tasks/main.yml | 0 .../sugar-stats/tasks/statistics-consolidation.yml | 0 .../statistics-consolidation/stats-consolidation.conf | 0 .../statistics-consolidation/stats-consolidation.cron | 0 .../statistics-consolidation/stats-consolidation.logrotate | 0 .../sugar-stats/templates/sugar-stats.conf.j2 | 0 roles/{ => 0-DEPRECATED-ROLES}/teamviewer/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/teamviewer/tasks/install.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/teamviewer/tasks/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/xovis/README.rst | 0 roles/{ => 0-DEPRECATED-ROLES}/xovis/defaults/main.yml | 0 roles/{ => 0-DEPRECATED-ROLES}/xovis/tasks/main.yml | 0 unmaintained-roles.txt | 4 ++++ 124 files changed, 5 insertions(+), 1 deletion(-) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/README.rst (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/bin/xs-check-activities (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/bin/xs-regenerate-activities (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/lang_templates/en/activity (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/lang_templates/en/page (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/lang_templates/es/activity (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/lang_templates/es/page (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/lang_templates/fr/activity (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/lang_templates/fr/page (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/lang_templates/ht/activity (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/lang_templates/ht/page (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/www.0/index.html.en (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/www.0/index.html.fr (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/www.0/index.html.ht (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/files/xs_activities/__init__.py (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/templates/usbmount-60-xs-activity-server-installcontent (100%) rename roles/{ => 0-DEPRECATED-ROLES}/activity-server/templates/xs-activity-server.conf (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ajenti/handlers/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ajenti/tasks/ajenti-wondershaper.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ajenti/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/authserver/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/authserver/templates/xs-authserver.env.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/authserver/templates/xs-authserver.service.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/debian_schooltool/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/debian_schooltool/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/debian_schooltool/templates/buildout.cfg (100%) rename roles/{ => 0-DEPRECATED-ROLES}/docker/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/docker/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/docker/templates/docker.service (100%) rename roles/{ => 0-DEPRECATED-ROLES}/docker/templates/docker.socket (100%) rename roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/README.rst (100%) rename roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/tasks/enable.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/tasks/install.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/templates/dokuwiki-nginx.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/dokuwiki/templates/dokuwiki.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/10-ejabberdmoodle (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberd (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberd-iiab (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberd-iiab.cfg.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberd-iiab.init (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberd-iiab.service.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberd.tmpfiles (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/ejabberdctl.cfg.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd/templates/iiab-ejabberd-srg (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/10-ejabberdmoodle (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/ejabberd (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/ejabberd-xs (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/ejabberd-xs.cfg.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/ejabberd-xs.init (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/ejabberd-xs.service.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/ejabberd.tmpfiles (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/ejabberdctl.cfg.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/ejabberd_xs/templates/xs-ejabberd-srg (100%) rename roles/{ => 0-DEPRECATED-ROLES}/idmgr/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/idmgr/templates/idmgr (100%) rename roles/{ => 0-DEPRECATED-ROLES}/idmgr/templates/idmgr.service.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/meta/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/templates/020-iiab-moodle.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/templates/020-xsce-moodle.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/templates/moodle-xs-init (100%) rename roles/{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/templates/moodle-xs.service.in (100%) rename roles/{ => 0-DEPRECATED-ROLES}/moodle-1.9/moodle/templates/moodle-xs.service.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/tasks/rpi.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/templates/nodogsplash.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/templates/nodogsplash.service.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/nodogsplash/templates/splash.html.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/templates/defaults.ini (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/templates/etc.iiab.conf (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/templates/l.control.geosearch.js (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/templates/map.html (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/templates/map_search.py (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/templates/osm.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/osm/templates/osm.repo (100%) rename roles/{ => 0-DEPRECATED-ROLES}/owncloud/README.rst (100%) rename roles/{ => 0-DEPRECATED-ROLES}/owncloud/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/owncloud/tasks/F18.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/owncloud/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/owncloud/tasks/owncloud_enabled.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/owncloud/templates/autoconfig.php.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/owncloud/templates/owncloud.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/owncloud/templates/owncloud.list (100%) rename roles/{ => 0-DEPRECATED-ROLES}/pathagar/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/pathagar/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/pathagar/templates/auth.User.json (100%) rename roles/{ => 0-DEPRECATED-ROLES}/pathagar/templates/pathagar.conf (100%) rename roles/{ => 0-DEPRECATED-ROLES}/pathagar/templates/prod_settings.py (100%) rename roles/{ => 0-DEPRECATED-ROLES}/pathagar/templates/wsgi.py (100%) rename roles/{ => 0-DEPRECATED-ROLES}/rachel/README.rst (100%) rename roles/{ => 0-DEPRECATED-ROLES}/rachel/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/rachel/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/rachel/tasks/rachel_enabled.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/rachel/templates/footer.html (100%) rename roles/{ => 0-DEPRECATED-ROLES}/rachel/templates/header.html (100%) rename roles/{ => 0-DEPRECATED-ROLES}/rachel/templates/rachel.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/schooltool/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/schooltool/meta/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/schooltool/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/schooltool/templates/schooltool.conf (100%) rename roles/{ => 0-DEPRECATED-ROLES}/schooltool/templates/schooltool.service (100%) rename roles/{ => 0-DEPRECATED-ROLES}/sugar-stats/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/sugar-stats/tasks/statistics-consolidation.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/sugar-stats/templates/statistics-consolidation/stats-consolidation.conf (100%) rename roles/{ => 0-DEPRECATED-ROLES}/sugar-stats/templates/statistics-consolidation/stats-consolidation.cron (100%) rename roles/{ => 0-DEPRECATED-ROLES}/sugar-stats/templates/statistics-consolidation/stats-consolidation.logrotate (100%) rename roles/{ => 0-DEPRECATED-ROLES}/sugar-stats/templates/sugar-stats.conf.j2 (100%) rename roles/{ => 0-DEPRECATED-ROLES}/teamviewer/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/teamviewer/tasks/install.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/teamviewer/tasks/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/xovis/README.rst (100%) rename roles/{ => 0-DEPRECATED-ROLES}/xovis/defaults/main.yml (100%) rename roles/{ => 0-DEPRECATED-ROLES}/xovis/tasks/main.yml (100%) diff --git a/iiab-install b/iiab-install index 9ffa92bc9..9be0af5bf 100755 --- a/iiab-install +++ b/iiab-install @@ -11,7 +11,7 @@ CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} MIN_RPI_KERN=4.19.79 # Can be further updated if necessary, when Raspbian's Oct 2019 kernels are more officially fixed such that running 'rpi-update' will no longer be nec soon, see: https://github.com/iiab/iiab/issues/1993 -MIN_ANSIBLE_VER=2.8.7 # Ansible 2.8.3 and 2.8.6 have serious bugs, preventing their use with IIAB. +MIN_ANSIBLE_VER=2.8.8 # Ansible 2.8.3 and 2.8.6 have serious bugs, preventing their use with IIAB. if [ ! -f /etc/iiab/local_vars.yml ]; then diff --git a/roles/activity-server/README.rst b/roles/0-DEPRECATED-ROLES/activity-server/README.rst similarity index 100% rename from roles/activity-server/README.rst rename to roles/0-DEPRECATED-ROLES/activity-server/README.rst diff --git a/roles/activity-server/defaults/main.yml b/roles/0-DEPRECATED-ROLES/activity-server/defaults/main.yml similarity index 100% rename from roles/activity-server/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/activity-server/defaults/main.yml diff --git a/roles/activity-server/files/bin/xs-check-activities b/roles/0-DEPRECATED-ROLES/activity-server/files/bin/xs-check-activities similarity index 100% rename from roles/activity-server/files/bin/xs-check-activities rename to roles/0-DEPRECATED-ROLES/activity-server/files/bin/xs-check-activities diff --git a/roles/activity-server/files/bin/xs-regenerate-activities b/roles/0-DEPRECATED-ROLES/activity-server/files/bin/xs-regenerate-activities similarity index 100% rename from roles/activity-server/files/bin/xs-regenerate-activities rename to roles/0-DEPRECATED-ROLES/activity-server/files/bin/xs-regenerate-activities diff --git a/roles/activity-server/files/lang_templates/en/activity b/roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/en/activity similarity index 100% rename from roles/activity-server/files/lang_templates/en/activity rename to roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/en/activity diff --git a/roles/activity-server/files/lang_templates/en/page b/roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/en/page similarity index 100% rename from roles/activity-server/files/lang_templates/en/page rename to roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/en/page diff --git a/roles/activity-server/files/lang_templates/es/activity b/roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/es/activity similarity index 100% rename from roles/activity-server/files/lang_templates/es/activity rename to roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/es/activity diff --git a/roles/activity-server/files/lang_templates/es/page b/roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/es/page similarity index 100% rename from roles/activity-server/files/lang_templates/es/page rename to roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/es/page diff --git a/roles/activity-server/files/lang_templates/fr/activity b/roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/fr/activity similarity index 100% rename from roles/activity-server/files/lang_templates/fr/activity rename to roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/fr/activity diff --git a/roles/activity-server/files/lang_templates/fr/page b/roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/fr/page similarity index 100% rename from roles/activity-server/files/lang_templates/fr/page rename to roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/fr/page diff --git a/roles/activity-server/files/lang_templates/ht/activity b/roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/ht/activity similarity index 100% rename from roles/activity-server/files/lang_templates/ht/activity rename to roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/ht/activity diff --git a/roles/activity-server/files/lang_templates/ht/page b/roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/ht/page similarity index 100% rename from roles/activity-server/files/lang_templates/ht/page rename to roles/0-DEPRECATED-ROLES/activity-server/files/lang_templates/ht/page diff --git a/roles/activity-server/files/www.0/index.html.en b/roles/0-DEPRECATED-ROLES/activity-server/files/www.0/index.html.en similarity index 100% rename from roles/activity-server/files/www.0/index.html.en rename to roles/0-DEPRECATED-ROLES/activity-server/files/www.0/index.html.en diff --git a/roles/activity-server/files/www.0/index.html.fr b/roles/0-DEPRECATED-ROLES/activity-server/files/www.0/index.html.fr similarity index 100% rename from roles/activity-server/files/www.0/index.html.fr rename to roles/0-DEPRECATED-ROLES/activity-server/files/www.0/index.html.fr diff --git a/roles/activity-server/files/www.0/index.html.ht b/roles/0-DEPRECATED-ROLES/activity-server/files/www.0/index.html.ht similarity index 100% rename from roles/activity-server/files/www.0/index.html.ht rename to roles/0-DEPRECATED-ROLES/activity-server/files/www.0/index.html.ht diff --git a/roles/activity-server/files/xs_activities/__init__.py b/roles/0-DEPRECATED-ROLES/activity-server/files/xs_activities/__init__.py similarity index 100% rename from roles/activity-server/files/xs_activities/__init__.py rename to roles/0-DEPRECATED-ROLES/activity-server/files/xs_activities/__init__.py diff --git a/roles/activity-server/tasks/main.yml b/roles/0-DEPRECATED-ROLES/activity-server/tasks/main.yml similarity index 100% rename from roles/activity-server/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/activity-server/tasks/main.yml diff --git a/roles/activity-server/templates/usbmount-60-xs-activity-server-installcontent b/roles/0-DEPRECATED-ROLES/activity-server/templates/usbmount-60-xs-activity-server-installcontent similarity index 100% rename from roles/activity-server/templates/usbmount-60-xs-activity-server-installcontent rename to roles/0-DEPRECATED-ROLES/activity-server/templates/usbmount-60-xs-activity-server-installcontent diff --git a/roles/activity-server/templates/xs-activity-server.conf b/roles/0-DEPRECATED-ROLES/activity-server/templates/xs-activity-server.conf similarity index 100% rename from roles/activity-server/templates/xs-activity-server.conf rename to roles/0-DEPRECATED-ROLES/activity-server/templates/xs-activity-server.conf diff --git a/roles/ajenti/handlers/main.yml b/roles/0-DEPRECATED-ROLES/ajenti/handlers/main.yml similarity index 100% rename from roles/ajenti/handlers/main.yml rename to roles/0-DEPRECATED-ROLES/ajenti/handlers/main.yml diff --git a/roles/ajenti/tasks/ajenti-wondershaper.yml b/roles/0-DEPRECATED-ROLES/ajenti/tasks/ajenti-wondershaper.yml similarity index 100% rename from roles/ajenti/tasks/ajenti-wondershaper.yml rename to roles/0-DEPRECATED-ROLES/ajenti/tasks/ajenti-wondershaper.yml diff --git a/roles/ajenti/tasks/main.yml b/roles/0-DEPRECATED-ROLES/ajenti/tasks/main.yml similarity index 100% rename from roles/ajenti/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/ajenti/tasks/main.yml diff --git a/roles/authserver/tasks/main.yml b/roles/0-DEPRECATED-ROLES/authserver/tasks/main.yml similarity index 100% rename from roles/authserver/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/authserver/tasks/main.yml diff --git a/roles/authserver/templates/xs-authserver.env.j2 b/roles/0-DEPRECATED-ROLES/authserver/templates/xs-authserver.env.j2 similarity index 100% rename from roles/authserver/templates/xs-authserver.env.j2 rename to roles/0-DEPRECATED-ROLES/authserver/templates/xs-authserver.env.j2 diff --git a/roles/authserver/templates/xs-authserver.service.j2 b/roles/0-DEPRECATED-ROLES/authserver/templates/xs-authserver.service.j2 similarity index 100% rename from roles/authserver/templates/xs-authserver.service.j2 rename to roles/0-DEPRECATED-ROLES/authserver/templates/xs-authserver.service.j2 diff --git a/roles/debian_schooltool/defaults/main.yml b/roles/0-DEPRECATED-ROLES/debian_schooltool/defaults/main.yml similarity index 100% rename from roles/debian_schooltool/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/debian_schooltool/defaults/main.yml diff --git a/roles/debian_schooltool/tasks/main.yml b/roles/0-DEPRECATED-ROLES/debian_schooltool/tasks/main.yml similarity index 100% rename from roles/debian_schooltool/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/debian_schooltool/tasks/main.yml diff --git a/roles/debian_schooltool/templates/buildout.cfg b/roles/0-DEPRECATED-ROLES/debian_schooltool/templates/buildout.cfg similarity index 100% rename from roles/debian_schooltool/templates/buildout.cfg rename to roles/0-DEPRECATED-ROLES/debian_schooltool/templates/buildout.cfg diff --git a/roles/docker/defaults/main.yml b/roles/0-DEPRECATED-ROLES/docker/defaults/main.yml similarity index 100% rename from roles/docker/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/docker/defaults/main.yml diff --git a/roles/docker/tasks/main.yml b/roles/0-DEPRECATED-ROLES/docker/tasks/main.yml similarity index 100% rename from roles/docker/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/docker/tasks/main.yml diff --git a/roles/docker/templates/docker.service b/roles/0-DEPRECATED-ROLES/docker/templates/docker.service similarity index 100% rename from roles/docker/templates/docker.service rename to roles/0-DEPRECATED-ROLES/docker/templates/docker.service diff --git a/roles/docker/templates/docker.socket b/roles/0-DEPRECATED-ROLES/docker/templates/docker.socket similarity index 100% rename from roles/docker/templates/docker.socket rename to roles/0-DEPRECATED-ROLES/docker/templates/docker.socket diff --git a/roles/dokuwiki/README.rst b/roles/0-DEPRECATED-ROLES/dokuwiki/README.rst similarity index 100% rename from roles/dokuwiki/README.rst rename to roles/0-DEPRECATED-ROLES/dokuwiki/README.rst diff --git a/roles/dokuwiki/defaults/main.yml b/roles/0-DEPRECATED-ROLES/dokuwiki/defaults/main.yml similarity index 100% rename from roles/dokuwiki/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/dokuwiki/defaults/main.yml diff --git a/roles/dokuwiki/tasks/enable.yml b/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml similarity index 100% rename from roles/dokuwiki/tasks/enable.yml rename to roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml diff --git a/roles/dokuwiki/tasks/install.yml b/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/install.yml similarity index 100% rename from roles/dokuwiki/tasks/install.yml rename to roles/0-DEPRECATED-ROLES/dokuwiki/tasks/install.yml diff --git a/roles/dokuwiki/tasks/main.yml b/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/main.yml similarity index 100% rename from roles/dokuwiki/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/dokuwiki/tasks/main.yml diff --git a/roles/dokuwiki/templates/dokuwiki-nginx.conf.j2 b/roles/0-DEPRECATED-ROLES/dokuwiki/templates/dokuwiki-nginx.conf.j2 similarity index 100% rename from roles/dokuwiki/templates/dokuwiki-nginx.conf.j2 rename to roles/0-DEPRECATED-ROLES/dokuwiki/templates/dokuwiki-nginx.conf.j2 diff --git a/roles/dokuwiki/templates/dokuwiki.conf.j2 b/roles/0-DEPRECATED-ROLES/dokuwiki/templates/dokuwiki.conf.j2 similarity index 100% rename from roles/dokuwiki/templates/dokuwiki.conf.j2 rename to roles/0-DEPRECATED-ROLES/dokuwiki/templates/dokuwiki.conf.j2 diff --git a/roles/ejabberd/tasks/main.yml b/roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml similarity index 100% rename from roles/ejabberd/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml diff --git a/roles/ejabberd/templates/10-ejabberdmoodle b/roles/0-DEPRECATED-ROLES/ejabberd/templates/10-ejabberdmoodle similarity index 100% rename from roles/ejabberd/templates/10-ejabberdmoodle rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/10-ejabberdmoodle diff --git a/roles/ejabberd/templates/ejabberd b/roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd similarity index 100% rename from roles/ejabberd/templates/ejabberd rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd diff --git a/roles/ejabberd/templates/ejabberd-iiab b/roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd-iiab similarity index 100% rename from roles/ejabberd/templates/ejabberd-iiab rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd-iiab diff --git a/roles/ejabberd/templates/ejabberd-iiab.cfg.j2 b/roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd-iiab.cfg.j2 similarity index 100% rename from roles/ejabberd/templates/ejabberd-iiab.cfg.j2 rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd-iiab.cfg.j2 diff --git a/roles/ejabberd/templates/ejabberd-iiab.init b/roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd-iiab.init similarity index 100% rename from roles/ejabberd/templates/ejabberd-iiab.init rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd-iiab.init diff --git a/roles/ejabberd/templates/ejabberd-iiab.service.j2 b/roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd-iiab.service.j2 similarity index 100% rename from roles/ejabberd/templates/ejabberd-iiab.service.j2 rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd-iiab.service.j2 diff --git a/roles/ejabberd/templates/ejabberd.tmpfiles b/roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd.tmpfiles similarity index 100% rename from roles/ejabberd/templates/ejabberd.tmpfiles rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberd.tmpfiles diff --git a/roles/ejabberd/templates/ejabberdctl.cfg.j2 b/roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberdctl.cfg.j2 similarity index 100% rename from roles/ejabberd/templates/ejabberdctl.cfg.j2 rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/ejabberdctl.cfg.j2 diff --git a/roles/ejabberd/templates/iiab-ejabberd-srg b/roles/0-DEPRECATED-ROLES/ejabberd/templates/iiab-ejabberd-srg similarity index 100% rename from roles/ejabberd/templates/iiab-ejabberd-srg rename to roles/0-DEPRECATED-ROLES/ejabberd/templates/iiab-ejabberd-srg diff --git a/roles/ejabberd_xs/tasks/main.yml b/roles/0-DEPRECATED-ROLES/ejabberd_xs/tasks/main.yml similarity index 100% rename from roles/ejabberd_xs/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/tasks/main.yml diff --git a/roles/ejabberd_xs/templates/10-ejabberdmoodle b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/10-ejabberdmoodle similarity index 100% rename from roles/ejabberd_xs/templates/10-ejabberdmoodle rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/10-ejabberdmoodle diff --git a/roles/ejabberd_xs/templates/ejabberd b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd similarity index 100% rename from roles/ejabberd_xs/templates/ejabberd rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd diff --git a/roles/ejabberd_xs/templates/ejabberd-xs b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd-xs similarity index 100% rename from roles/ejabberd_xs/templates/ejabberd-xs rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd-xs diff --git a/roles/ejabberd_xs/templates/ejabberd-xs.cfg.j2 b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd-xs.cfg.j2 similarity index 100% rename from roles/ejabberd_xs/templates/ejabberd-xs.cfg.j2 rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd-xs.cfg.j2 diff --git a/roles/ejabberd_xs/templates/ejabberd-xs.init b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd-xs.init similarity index 100% rename from roles/ejabberd_xs/templates/ejabberd-xs.init rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd-xs.init diff --git a/roles/ejabberd_xs/templates/ejabberd-xs.service.j2 b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd-xs.service.j2 similarity index 100% rename from roles/ejabberd_xs/templates/ejabberd-xs.service.j2 rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd-xs.service.j2 diff --git a/roles/ejabberd_xs/templates/ejabberd.tmpfiles b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd.tmpfiles similarity index 100% rename from roles/ejabberd_xs/templates/ejabberd.tmpfiles rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberd.tmpfiles diff --git a/roles/ejabberd_xs/templates/ejabberdctl.cfg.j2 b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberdctl.cfg.j2 similarity index 100% rename from roles/ejabberd_xs/templates/ejabberdctl.cfg.j2 rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/ejabberdctl.cfg.j2 diff --git a/roles/ejabberd_xs/templates/xs-ejabberd-srg b/roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/xs-ejabberd-srg similarity index 100% rename from roles/ejabberd_xs/templates/xs-ejabberd-srg rename to roles/0-DEPRECATED-ROLES/ejabberd_xs/templates/xs-ejabberd-srg diff --git a/roles/idmgr/tasks/main.yml b/roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml similarity index 100% rename from roles/idmgr/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml diff --git a/roles/idmgr/templates/idmgr b/roles/0-DEPRECATED-ROLES/idmgr/templates/idmgr similarity index 100% rename from roles/idmgr/templates/idmgr rename to roles/0-DEPRECATED-ROLES/idmgr/templates/idmgr diff --git a/roles/idmgr/templates/idmgr.service.j2 b/roles/0-DEPRECATED-ROLES/idmgr/templates/idmgr.service.j2 similarity index 100% rename from roles/idmgr/templates/idmgr.service.j2 rename to roles/0-DEPRECATED-ROLES/idmgr/templates/idmgr.service.j2 diff --git a/roles/moodle-1.9/moodle/meta/main.yml b/roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/meta/main.yml similarity index 100% rename from roles/moodle-1.9/moodle/meta/main.yml rename to roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/meta/main.yml diff --git a/roles/moodle-1.9/moodle/tasks/main.yml b/roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/tasks/main.yml similarity index 100% rename from roles/moodle-1.9/moodle/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/tasks/main.yml diff --git a/roles/moodle-1.9/moodle/templates/020-iiab-moodle.conf.j2 b/roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/020-iiab-moodle.conf.j2 similarity index 100% rename from roles/moodle-1.9/moodle/templates/020-iiab-moodle.conf.j2 rename to roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/020-iiab-moodle.conf.j2 diff --git a/roles/moodle-1.9/moodle/templates/020-xsce-moodle.conf.j2 b/roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/020-xsce-moodle.conf.j2 similarity index 100% rename from roles/moodle-1.9/moodle/templates/020-xsce-moodle.conf.j2 rename to roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/020-xsce-moodle.conf.j2 diff --git a/roles/moodle-1.9/moodle/templates/moodle-xs-init b/roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/moodle-xs-init similarity index 100% rename from roles/moodle-1.9/moodle/templates/moodle-xs-init rename to roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/moodle-xs-init diff --git a/roles/moodle-1.9/moodle/templates/moodle-xs.service.in b/roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/moodle-xs.service.in similarity index 100% rename from roles/moodle-1.9/moodle/templates/moodle-xs.service.in rename to roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/moodle-xs.service.in diff --git a/roles/moodle-1.9/moodle/templates/moodle-xs.service.j2 b/roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/moodle-xs.service.j2 similarity index 100% rename from roles/moodle-1.9/moodle/templates/moodle-xs.service.j2 rename to roles/0-DEPRECATED-ROLES/moodle-1.9/moodle/templates/moodle-xs.service.j2 diff --git a/roles/nodogsplash/defaults/main.yml b/roles/0-DEPRECATED-ROLES/nodogsplash/defaults/main.yml similarity index 100% rename from roles/nodogsplash/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/nodogsplash/defaults/main.yml diff --git a/roles/nodogsplash/tasks/main.yml b/roles/0-DEPRECATED-ROLES/nodogsplash/tasks/main.yml similarity index 100% rename from roles/nodogsplash/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/nodogsplash/tasks/main.yml diff --git a/roles/nodogsplash/tasks/rpi.yml b/roles/0-DEPRECATED-ROLES/nodogsplash/tasks/rpi.yml similarity index 100% rename from roles/nodogsplash/tasks/rpi.yml rename to roles/0-DEPRECATED-ROLES/nodogsplash/tasks/rpi.yml diff --git a/roles/nodogsplash/templates/nodogsplash.conf.j2 b/roles/0-DEPRECATED-ROLES/nodogsplash/templates/nodogsplash.conf.j2 similarity index 100% rename from roles/nodogsplash/templates/nodogsplash.conf.j2 rename to roles/0-DEPRECATED-ROLES/nodogsplash/templates/nodogsplash.conf.j2 diff --git a/roles/nodogsplash/templates/nodogsplash.service.j2 b/roles/0-DEPRECATED-ROLES/nodogsplash/templates/nodogsplash.service.j2 similarity index 100% rename from roles/nodogsplash/templates/nodogsplash.service.j2 rename to roles/0-DEPRECATED-ROLES/nodogsplash/templates/nodogsplash.service.j2 diff --git a/roles/nodogsplash/templates/splash.html.j2 b/roles/0-DEPRECATED-ROLES/nodogsplash/templates/splash.html.j2 similarity index 100% rename from roles/nodogsplash/templates/splash.html.j2 rename to roles/0-DEPRECATED-ROLES/nodogsplash/templates/splash.html.j2 diff --git a/roles/osm/defaults/main.yml b/roles/0-DEPRECATED-ROLES/osm/defaults/main.yml similarity index 100% rename from roles/osm/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/osm/defaults/main.yml diff --git a/roles/osm/tasks/main.yml b/roles/0-DEPRECATED-ROLES/osm/tasks/main.yml similarity index 100% rename from roles/osm/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/osm/tasks/main.yml diff --git a/roles/osm/templates/defaults.ini b/roles/0-DEPRECATED-ROLES/osm/templates/defaults.ini similarity index 100% rename from roles/osm/templates/defaults.ini rename to roles/0-DEPRECATED-ROLES/osm/templates/defaults.ini diff --git a/roles/osm/templates/etc.iiab.conf b/roles/0-DEPRECATED-ROLES/osm/templates/etc.iiab.conf similarity index 100% rename from roles/osm/templates/etc.iiab.conf rename to roles/0-DEPRECATED-ROLES/osm/templates/etc.iiab.conf diff --git a/roles/osm/templates/l.control.geosearch.js b/roles/0-DEPRECATED-ROLES/osm/templates/l.control.geosearch.js similarity index 100% rename from roles/osm/templates/l.control.geosearch.js rename to roles/0-DEPRECATED-ROLES/osm/templates/l.control.geosearch.js diff --git a/roles/osm/templates/map.html b/roles/0-DEPRECATED-ROLES/osm/templates/map.html similarity index 100% rename from roles/osm/templates/map.html rename to roles/0-DEPRECATED-ROLES/osm/templates/map.html diff --git a/roles/osm/templates/map_search.py b/roles/0-DEPRECATED-ROLES/osm/templates/map_search.py similarity index 100% rename from roles/osm/templates/map_search.py rename to roles/0-DEPRECATED-ROLES/osm/templates/map_search.py diff --git a/roles/osm/templates/osm.conf.j2 b/roles/0-DEPRECATED-ROLES/osm/templates/osm.conf.j2 similarity index 100% rename from roles/osm/templates/osm.conf.j2 rename to roles/0-DEPRECATED-ROLES/osm/templates/osm.conf.j2 diff --git a/roles/osm/templates/osm.repo b/roles/0-DEPRECATED-ROLES/osm/templates/osm.repo similarity index 100% rename from roles/osm/templates/osm.repo rename to roles/0-DEPRECATED-ROLES/osm/templates/osm.repo diff --git a/roles/owncloud/README.rst b/roles/0-DEPRECATED-ROLES/owncloud/README.rst similarity index 100% rename from roles/owncloud/README.rst rename to roles/0-DEPRECATED-ROLES/owncloud/README.rst diff --git a/roles/owncloud/defaults/main.yml b/roles/0-DEPRECATED-ROLES/owncloud/defaults/main.yml similarity index 100% rename from roles/owncloud/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/owncloud/defaults/main.yml diff --git a/roles/owncloud/tasks/F18.yml b/roles/0-DEPRECATED-ROLES/owncloud/tasks/F18.yml similarity index 100% rename from roles/owncloud/tasks/F18.yml rename to roles/0-DEPRECATED-ROLES/owncloud/tasks/F18.yml diff --git a/roles/owncloud/tasks/main.yml b/roles/0-DEPRECATED-ROLES/owncloud/tasks/main.yml similarity index 100% rename from roles/owncloud/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/owncloud/tasks/main.yml diff --git a/roles/owncloud/tasks/owncloud_enabled.yml b/roles/0-DEPRECATED-ROLES/owncloud/tasks/owncloud_enabled.yml similarity index 100% rename from roles/owncloud/tasks/owncloud_enabled.yml rename to roles/0-DEPRECATED-ROLES/owncloud/tasks/owncloud_enabled.yml diff --git a/roles/owncloud/templates/autoconfig.php.j2 b/roles/0-DEPRECATED-ROLES/owncloud/templates/autoconfig.php.j2 similarity index 100% rename from roles/owncloud/templates/autoconfig.php.j2 rename to roles/0-DEPRECATED-ROLES/owncloud/templates/autoconfig.php.j2 diff --git a/roles/owncloud/templates/owncloud.conf.j2 b/roles/0-DEPRECATED-ROLES/owncloud/templates/owncloud.conf.j2 similarity index 100% rename from roles/owncloud/templates/owncloud.conf.j2 rename to roles/0-DEPRECATED-ROLES/owncloud/templates/owncloud.conf.j2 diff --git a/roles/owncloud/templates/owncloud.list b/roles/0-DEPRECATED-ROLES/owncloud/templates/owncloud.list similarity index 100% rename from roles/owncloud/templates/owncloud.list rename to roles/0-DEPRECATED-ROLES/owncloud/templates/owncloud.list diff --git a/roles/pathagar/defaults/main.yml b/roles/0-DEPRECATED-ROLES/pathagar/defaults/main.yml similarity index 100% rename from roles/pathagar/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/pathagar/defaults/main.yml diff --git a/roles/pathagar/tasks/main.yml b/roles/0-DEPRECATED-ROLES/pathagar/tasks/main.yml similarity index 100% rename from roles/pathagar/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/pathagar/tasks/main.yml diff --git a/roles/pathagar/templates/auth.User.json b/roles/0-DEPRECATED-ROLES/pathagar/templates/auth.User.json similarity index 100% rename from roles/pathagar/templates/auth.User.json rename to roles/0-DEPRECATED-ROLES/pathagar/templates/auth.User.json diff --git a/roles/pathagar/templates/pathagar.conf b/roles/0-DEPRECATED-ROLES/pathagar/templates/pathagar.conf similarity index 100% rename from roles/pathagar/templates/pathagar.conf rename to roles/0-DEPRECATED-ROLES/pathagar/templates/pathagar.conf diff --git a/roles/pathagar/templates/prod_settings.py b/roles/0-DEPRECATED-ROLES/pathagar/templates/prod_settings.py similarity index 100% rename from roles/pathagar/templates/prod_settings.py rename to roles/0-DEPRECATED-ROLES/pathagar/templates/prod_settings.py diff --git a/roles/pathagar/templates/wsgi.py b/roles/0-DEPRECATED-ROLES/pathagar/templates/wsgi.py similarity index 100% rename from roles/pathagar/templates/wsgi.py rename to roles/0-DEPRECATED-ROLES/pathagar/templates/wsgi.py diff --git a/roles/rachel/README.rst b/roles/0-DEPRECATED-ROLES/rachel/README.rst similarity index 100% rename from roles/rachel/README.rst rename to roles/0-DEPRECATED-ROLES/rachel/README.rst diff --git a/roles/rachel/defaults/main.yml b/roles/0-DEPRECATED-ROLES/rachel/defaults/main.yml similarity index 100% rename from roles/rachel/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/rachel/defaults/main.yml diff --git a/roles/rachel/tasks/main.yml b/roles/0-DEPRECATED-ROLES/rachel/tasks/main.yml similarity index 100% rename from roles/rachel/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/rachel/tasks/main.yml diff --git a/roles/rachel/tasks/rachel_enabled.yml b/roles/0-DEPRECATED-ROLES/rachel/tasks/rachel_enabled.yml similarity index 100% rename from roles/rachel/tasks/rachel_enabled.yml rename to roles/0-DEPRECATED-ROLES/rachel/tasks/rachel_enabled.yml diff --git a/roles/rachel/templates/footer.html b/roles/0-DEPRECATED-ROLES/rachel/templates/footer.html similarity index 100% rename from roles/rachel/templates/footer.html rename to roles/0-DEPRECATED-ROLES/rachel/templates/footer.html diff --git a/roles/rachel/templates/header.html b/roles/0-DEPRECATED-ROLES/rachel/templates/header.html similarity index 100% rename from roles/rachel/templates/header.html rename to roles/0-DEPRECATED-ROLES/rachel/templates/header.html diff --git a/roles/rachel/templates/rachel.conf.j2 b/roles/0-DEPRECATED-ROLES/rachel/templates/rachel.conf.j2 similarity index 100% rename from roles/rachel/templates/rachel.conf.j2 rename to roles/0-DEPRECATED-ROLES/rachel/templates/rachel.conf.j2 diff --git a/roles/schooltool/defaults/main.yml b/roles/0-DEPRECATED-ROLES/schooltool/defaults/main.yml similarity index 100% rename from roles/schooltool/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/schooltool/defaults/main.yml diff --git a/roles/schooltool/meta/main.yml b/roles/0-DEPRECATED-ROLES/schooltool/meta/main.yml similarity index 100% rename from roles/schooltool/meta/main.yml rename to roles/0-DEPRECATED-ROLES/schooltool/meta/main.yml diff --git a/roles/schooltool/tasks/main.yml b/roles/0-DEPRECATED-ROLES/schooltool/tasks/main.yml similarity index 100% rename from roles/schooltool/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/schooltool/tasks/main.yml diff --git a/roles/schooltool/templates/schooltool.conf b/roles/0-DEPRECATED-ROLES/schooltool/templates/schooltool.conf similarity index 100% rename from roles/schooltool/templates/schooltool.conf rename to roles/0-DEPRECATED-ROLES/schooltool/templates/schooltool.conf diff --git a/roles/schooltool/templates/schooltool.service b/roles/0-DEPRECATED-ROLES/schooltool/templates/schooltool.service similarity index 100% rename from roles/schooltool/templates/schooltool.service rename to roles/0-DEPRECATED-ROLES/schooltool/templates/schooltool.service diff --git a/roles/sugar-stats/tasks/main.yml b/roles/0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml similarity index 100% rename from roles/sugar-stats/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml diff --git a/roles/sugar-stats/tasks/statistics-consolidation.yml b/roles/0-DEPRECATED-ROLES/sugar-stats/tasks/statistics-consolidation.yml similarity index 100% rename from roles/sugar-stats/tasks/statistics-consolidation.yml rename to roles/0-DEPRECATED-ROLES/sugar-stats/tasks/statistics-consolidation.yml diff --git a/roles/sugar-stats/templates/statistics-consolidation/stats-consolidation.conf b/roles/0-DEPRECATED-ROLES/sugar-stats/templates/statistics-consolidation/stats-consolidation.conf similarity index 100% rename from roles/sugar-stats/templates/statistics-consolidation/stats-consolidation.conf rename to roles/0-DEPRECATED-ROLES/sugar-stats/templates/statistics-consolidation/stats-consolidation.conf diff --git a/roles/sugar-stats/templates/statistics-consolidation/stats-consolidation.cron b/roles/0-DEPRECATED-ROLES/sugar-stats/templates/statistics-consolidation/stats-consolidation.cron similarity index 100% rename from roles/sugar-stats/templates/statistics-consolidation/stats-consolidation.cron rename to roles/0-DEPRECATED-ROLES/sugar-stats/templates/statistics-consolidation/stats-consolidation.cron diff --git a/roles/sugar-stats/templates/statistics-consolidation/stats-consolidation.logrotate b/roles/0-DEPRECATED-ROLES/sugar-stats/templates/statistics-consolidation/stats-consolidation.logrotate similarity index 100% rename from roles/sugar-stats/templates/statistics-consolidation/stats-consolidation.logrotate rename to roles/0-DEPRECATED-ROLES/sugar-stats/templates/statistics-consolidation/stats-consolidation.logrotate diff --git a/roles/sugar-stats/templates/sugar-stats.conf.j2 b/roles/0-DEPRECATED-ROLES/sugar-stats/templates/sugar-stats.conf.j2 similarity index 100% rename from roles/sugar-stats/templates/sugar-stats.conf.j2 rename to roles/0-DEPRECATED-ROLES/sugar-stats/templates/sugar-stats.conf.j2 diff --git a/roles/teamviewer/defaults/main.yml b/roles/0-DEPRECATED-ROLES/teamviewer/defaults/main.yml similarity index 100% rename from roles/teamviewer/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/teamviewer/defaults/main.yml diff --git a/roles/teamviewer/tasks/install.yml b/roles/0-DEPRECATED-ROLES/teamviewer/tasks/install.yml similarity index 100% rename from roles/teamviewer/tasks/install.yml rename to roles/0-DEPRECATED-ROLES/teamviewer/tasks/install.yml diff --git a/roles/teamviewer/tasks/main.yml b/roles/0-DEPRECATED-ROLES/teamviewer/tasks/main.yml similarity index 100% rename from roles/teamviewer/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/teamviewer/tasks/main.yml diff --git a/roles/xovis/README.rst b/roles/0-DEPRECATED-ROLES/xovis/README.rst similarity index 100% rename from roles/xovis/README.rst rename to roles/0-DEPRECATED-ROLES/xovis/README.rst diff --git a/roles/xovis/defaults/main.yml b/roles/0-DEPRECATED-ROLES/xovis/defaults/main.yml similarity index 100% rename from roles/xovis/defaults/main.yml rename to roles/0-DEPRECATED-ROLES/xovis/defaults/main.yml diff --git a/roles/xovis/tasks/main.yml b/roles/0-DEPRECATED-ROLES/xovis/tasks/main.yml similarity index 100% rename from roles/xovis/tasks/main.yml rename to roles/0-DEPRECATED-ROLES/xovis/tasks/main.yml diff --git a/unmaintained-roles.txt b/unmaintained-roles.txt index b43eea71d..f04b87c9e 100644 --- a/unmaintained-roles.txt +++ b/unmaintained-roles.txt @@ -3,13 +3,17 @@ ajenti authserver debian_schooltool docker +dokuwiki +ejabberd ejabberd_xs idmgr moodle-1.9 nodogsplash +osm owncloud pathagar rachel schooltool sugar-stats +teamviewer xovis From 07904bc5159b989d8fda372edefd3a0620fe379b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Jan 2020 02:36:55 -0500 Subject: [PATCH 4/4] Sync up unmaintained-roles.txt with tests/test.yml --- tests/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test.yml b/tests/test.yml index 858e12830..f39c2807d 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -21,8 +21,8 @@ - { role: cups } #- { role: debian_schooltool } #- { role: docker } - - { role: dokuwiki } - - { role: ejabberd } + #- { role: dokuwiki } + #- { role: ejabberd } #- { role: ejabberd_xs } - { role: elgg } - { role: homepage } @@ -44,7 +44,7 @@ - { role: nextcloud } #- { role: nodogsplash } - { role: openvpn } - - { role: osm } + #- { role: osm } #- { role: owncloud } #- { role: pathagar } - { role: phpmyadmin } @@ -55,7 +55,7 @@ - { role: sshd } - { role: sugarizer } #- { role: sugar-stats } - - { role: teamviewer } + #- { role: teamviewer } - { role: transmission } - { role: usb-lib } - { role: vnstat }