diff --git a/install-support.yml.deprecated b/install-support.yml.deprecated
deleted file mode 100644
index e47229004..000000000
--- a/install-support.yml.deprecated
+++ /dev/null
@@ -1,13 +0,0 @@
-- hosts: all
- become: yes
-
- vars_files:
- - vars/default_vars.yml
- - vars/{{ ansible_local.local_facts.os_ver }}.yml
- - /etc/iiab/local_vars.yml
-
- roles:
- - { role: 0-init, tags: ['0-init'] }
- - { role: sshd, tags: ['sshd'] }
- - { role: iiab-admin, tags: ['iiab-admin'] }
- - { role: openvpn, tags: ['openvpn'] }
diff --git a/roles/awstats/templates/cron.d.awstats.deprecated b/roles/awstats/templates/cron.d.awstats.deprecated
deleted file mode 100644
index dc8a66595..000000000
--- a/roles/awstats/templates/cron.d.awstats.deprecated
+++ /dev/null
@@ -1,6 +0,0 @@
-MAILTO=root
-
-*/10 * * * * www-data [ -x /usr/share/awstats/tools/update.sh ] && /usr/share/awstats/tools/update.sh
-
-# Generate static reports:
-10 03 * * * www-data [ -x /usr/share/awstats/tools/buildstatic.sh ] && /usr/share/awstats/tools/buildstatic.sh
diff --git a/roles/httpd/files/osm.conf.deprecated b/roles/httpd/files/osm.conf.deprecated
deleted file mode 100644
index 568ed64e1..000000000
--- a/roles/httpd/files/osm.conf.deprecated
+++ /dev/null
@@ -1,3 +0,0 @@
-# For new vector tileset, as documented @ http://FAQ.IIAB.IO ("How do I add zoomable maps for my region? ") & http://download.iiab.io/content/OSM/vector-tiles/
-Alias /maps /library/www/html/modules/en-osm-omt-min/
-Alias /osm /library/www/html/modules/en-osm-omt-min/
diff --git a/roles/httpd/templates/httpd.j2.deprecated b/roles/httpd/templates/httpd.j2.deprecated
deleted file mode 100755
index 6b35fab2c..000000000
--- a/roles/httpd/templates/httpd.j2.deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration file for the httpd service.
-# earlier XS httpd passed memory size as command line variable
-# systemd requires that this be done at setup time in httpd.conf
-#
-#
-OPTIONS=" -f conf/httpd-xs.conf
-
-
diff --git a/roles/httpd/templates/iiab-http.deprecated b/roles/httpd/templates/iiab-http.deprecated
deleted file mode 100644
index ffed8ab8d..000000000
--- a/roles/httpd/templates/iiab-http.deprecated
+++ /dev/null
@@ -1 +0,0 @@
-apache ALL=NOPASSWD: /usr/sbin/iptables-save,/usr/sbin/fdisk,/usr/bin/xs-flashbench,/usr/bin/xs-acpowergaps,/root/xs-apply-changes,/usr/bin/xs-regenerate-activities,/bin/mount,/bin/ls,/bin/df,/bin/cat,/bin/systemctl
diff --git a/roles/httpd/templates/iiab-http.j2.deprecated b/roles/httpd/templates/iiab-http.j2.deprecated
deleted file mode 100755
index ffed8ab8d..000000000
--- a/roles/httpd/templates/iiab-http.j2.deprecated
+++ /dev/null
@@ -1 +0,0 @@
-apache ALL=NOPASSWD: /usr/sbin/iptables-save,/usr/sbin/fdisk,/usr/bin/xs-flashbench,/usr/bin/xs-acpowergaps,/root/xs-apply-changes,/usr/bin/xs-regenerate-activities,/bin/mount,/bin/ls,/bin/df,/bin/cat,/bin/systemctl
diff --git a/roles/httpd/templates/iiab-info.conf.j2.deprecated b/roles/httpd/templates/iiab-info.conf.j2.deprecated
deleted file mode 100644
index ef26ec960..000000000
--- a/roles/httpd/templates/iiab-info.conf.j2.deprecated
+++ /dev/null
@@ -1,11 +0,0 @@
-Alias /info/ {{ iiab_dir }}/docs/html/
-Alias /info {{ iiab_dir }}/docs/html/
-
-
- Options +Indexes
- IndexOptions FancyIndexing
- IndexOptions HTMLTable
- IndexOptions SuppressColumnsorting
- IndexOptions Charset=UTF-8
- Require all granted
-
diff --git a/roles/httpd/templates/php.ini.j2.deprecated b/roles/httpd/templates/php.ini.j2.deprecated
deleted file mode 100755
index 04a5ec594..000000000
--- a/roles/httpd/templates/php.ini.j2.deprecated
+++ /dev/null
@@ -1,1233 +0,0 @@
-[PHP]
-
-;;;;;;;;;;;;;;;;;;;
-; About php.ini ;
-;;;;;;;;;;;;;;;;;;;
-; This file controls many aspects of PHP's behavior. In order for PHP to
-; read it, it must be named 'php.ini'. PHP looks for it in the current
-; working directory, in the path designated by the environment variable
-; PHPRC, and in the path that was defined in compile time (in that order).
-; Under Windows, the compile-time path is the Windows directory. The
-; path in which the php.ini file is looked for can be overridden using
-; the -c argument in command line mode.
-;
-; The syntax of the file is extremely simple. Whitespace and Lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-;
-; Directives are specified using the following syntax:
-; directive = value
-; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-;
-; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
-; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
-;
-; Expressions in the INI file are limited to bitwise operators and parentheses:
-; | bitwise OR
-; & bitwise AND
-; ~ bitwise NOT
-; ! boolean NOT
-;
-; Boolean flags can be turned on using the values 1, On, True or Yes.
-; They can be turned off using the values 0, Off, False or No.
-;
-; An empty string can be denoted by simply not writing anything after the equal
-; sign, or by using the None keyword:
-;
-; foo = ; sets foo to an empty string
-; foo = none ; sets foo to an empty string
-; foo = "none" ; sets foo to the string 'none'
-;
-; If you use constants in your value, and these constants belong to a
-; dynamically loaded extension (either a PHP extension or a Zend extension),
-; you may only use these constants *after* the line that loads the extension.
-;
-;
-;;;;;;;;;;;;;;;;;;;
-; About this file ;
-;;;;;;;;;;;;;;;;;;;
-; This is the recommended, PHP 5-style version of the php.ini-dist file. It
-; sets some non standard settings, that make PHP more efficient, more secure,
-; and encourage cleaner coding.
-;
-; The price is that with these settings, PHP may be incompatible with some
-; applications, and sometimes, more difficult to develop with. Using this
-; file is warmly recommended for production sites. As all of the changes from
-; the standard settings are thoroughly documented, you can go over each one,
-; and decide whether you want to use it or not.
-;
-; For general information about the php.ini file, please consult the php.ini-dist
-; file, included in your PHP distribution.
-;
-; This file is different from the php.ini-dist file in the fact that it features
-; different values for several directives, in order to improve performance, while
-; possibly breaking compatibility with the standard out-of-the-box behavior of
-; PHP. Please make sure you read what's different, and modify your scripts
-; accordingly, if you decide to use this file instead.
-;
-; - register_long_arrays = Off [Performance]
-; Disables registration of the older (and deprecated) long predefined array
-; variables ($HTTP_*_VARS). Instead, use the superglobals that were
-; introduced in PHP 4.1.0
-; - display_errors = Off [Security]
-; With this directive set to off, errors that occur during the execution of
-; scripts will no longer be displayed as a part of the script output, and thus,
-; will no longer be exposed to remote users. With some errors, the error message
-; content may expose information about your script, web server, or database
-; server that may be exploitable for hacking. Production sites should have this
-; directive set to off.
-; - log_errors = On [Security]
-; This directive complements the above one. Any errors that occur during the
-; execution of your script will be logged (typically, to your server's error log,
-; but can be configured in several ways). Along with setting display_errors to off,
-; this setup gives you the ability to fully understand what may have gone wrong,
-; without exposing any sensitive information to remote users.
-; - output_buffering = 4096 [Performance]
-; Set a 4KB output buffer. Enabling output buffering typically results in less
-; writes, and sometimes less packets sent on the wire, which can often lead to
-; better performance. The gain this directive actually yields greatly depends
-; on which Web server you're working with, and what kind of scripts you're using.
-; - register_argc_argv = Off [Performance]
-; Disables registration of the somewhat redundant $argv and $argc global
-; variables.
-; - magic_quotes_gpc = Off [Performance]
-; Input data is no longer escaped with slashes so that it can be sent into
-; SQL databases without further manipulation. Instead, you should use the
-; function addslashes() on each input element you wish to send to a database.
-; - variables_order = "GPCS" [Performance]
-; The environment variables are not hashed into the $_ENV. To access
-; environment variables, you can use getenv() instead.
-; - error_reporting = E_ALL [Code Cleanliness, Security(?)]
-; By default, PHP suppresses errors of type E_NOTICE. These error messages
-; are emitted for non-critical errors, but that could be a symptom of a bigger
-; problem. Most notably, this will cause error messages about the use
-; of uninitialized variables to be displayed.
-; - allow_call_time_pass_reference = Off [Code cleanliness]
-; It's not possible to decide to force a variable to be passed by reference
-; when calling a function. The PHP 4 style to do this is by making the
-; function require the relevant argument by reference.
-
-;;;;;;;;;;;;;;;;;;;;
-; Language Options ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Enable the PHP scripting language engine under Apache.
-engine = On
-
-; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
-zend.ze1_compatibility_mode = Off
-
-; Allow the tags are recognized.
-; NOTE: Using short tags should be avoided when developing applications or
-; libraries that are meant for redistribution, or deployment on PHP
-; servers which are not under your control, because short tags may not
-; be supported on the target server. For portable, redistributable code,
-; be sure not to use short tags.
-short_open_tag = Off
-
-; Allow ASP-style <% %> tags.
-asp_tags = Off
-
-; The number of significant digits displayed in floating point numbers.
-precision = 14
-
-; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-y2k_compliance = On
-
-; Output buffering allows you to send header lines (including cookies) even
-; after you send body content, at the price of slowing PHP's output layer a
-; bit. You can enable output buffering during runtime by calling the output
-; buffering functions. You can also enable output buffering for all files by
-; setting this directive to On. If you wish to limit the size of the buffer
-; to a certain size - you can use a maximum number of bytes instead of 'On', as
-; a value for this directive (e.g., output_buffering=4096).
-output_buffering = 4096
-
-; You can redirect all of the output of your scripts to a function. For
-; example, if you set output_handler to "mb_output_handler", character
-; encoding will be transparently converted to the specified encoding.
-; Setting any output handler automatically turns on output buffering.
-; Note: People who wrote portable scripts should not depend on this ini
-; directive. Instead, explicitly set the output handler using ob_start().
-; Using this ini directive may cause problems unless you know what script
-; is doing.
-; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-; Note: output_handler must be empty if this is set 'On' !!!!
-; Instead you must use zlib.output_handler.
-;output_handler =
-
-; Transparent output compression using the zlib library
-; Valid values for this option are 'off', 'on', or a specific buffer size
-; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP
-; outputs chunks that are few hundreds bytes each as a result of
-; compression. If you prefer a larger chunk size for better
-; performance, enable output_buffering in addition.
-; Note: You need to use zlib.output_handler instead of the standard
-; output_handler, or otherwise the output will be corrupted.
-zlib.output_compression = Off
-;zlib.output_compression_level = -1
-
-; You cannot specify additional output handlers if zlib.output_compression
-; is activated here. This setting does the same as output_handler but in
-; a different order.
-;zlib.output_handler =
-
-; Implicit flush tells PHP to tell the output layer to flush itself
-; automatically after every output block. This is equivalent to calling the
-; PHP function flush() after each and every call to print() or echo() and each
-; and every HTML block. Turning this option on has serious performance
-; implications and is generally recommended for debugging purposes only.
-implicit_flush = Off
-
-; The unserialize callback function will be called (with the undefined class'
-; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated.
-; A warning appears if the specified function is not defined, or if the
-; function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a
-; callback-function.
-unserialize_callback_func=
-
-; When floats & doubles are serialized store serialize_precision significant
-; digits after the floating point. The default value ensures that when floats
-; are decoded with unserialize, the data will remain the same.
-serialize_precision = 100
-
-; Whether to enable the ability to force arguments to be passed by reference
-; at function call time. This method is deprecated and is likely to be
-; unsupported in future versions of PHP/Zend. The encouraged method of
-; specifying which arguments should be passed by reference is in the function
-; declaration. You're encouraged to try and turn this option Off and make
-; sure your scripts work properly with it in order to ensure they will work
-; with future versions of the language (you will receive a warning each time
-; you use this feature, and the argument will be passed by value instead of by
-; reference).
-allow_call_time_pass_reference = Off
-
-;
-; Safe Mode
-;
-safe_mode = Off
-
-; By default, Safe Mode does a UID compare check when
-; opening files. If you want to relax this to a GID compare,
-; then turn on safe_mode_gid.
-safe_mode_gid = Off
-
-; When safe_mode is on, UID/GID checks are bypassed when
-; including files from this directory and its subdirectories.
-; (directory must also be in include_path or full path must
-; be used when including)
-safe_mode_include_dir =
-
-; When safe_mode is on, only executables located in the safe_mode_exec_dir
-; will be allowed to be executed via the exec family of functions.
-safe_mode_exec_dir =
-
-; Setting certain environment variables may be a potential security breach.
-; This directive contains a comma-delimited list of prefixes. In Safe Mode,
-; the user may only alter environment variables whose names begin with the
-; prefixes supplied here. By default, users will only be able to set
-; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
-;
-; Note: If this directive is empty, PHP will let the user modify ANY
-; environment variable!
-safe_mode_allowed_env_vars = PHP_
-
-; This directive contains a comma-delimited list of environment variables that
-; the end user won't be able to change using putenv(). These variables will be
-; protected even if safe_mode_allowed_env_vars is set to allow to change them.
-safe_mode_protected_env_vars = LD_LIBRARY_PATH
-
-; open_basedir, if set, limits all file operations to the defined directory
-; and below. This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-;open_basedir =
-
-; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_functions =
-
-; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_classes =
-
-; Colors for Syntax Highlighting mode. Anything that's acceptable in
-; would work.
-;highlight.string = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.bg = #FFFFFF
-;highlight.default = #0000BB
-;highlight.html = #000000
-
-; If enabled, the request will be allowed to complete even if the user aborts
-; the request. Consider enabling it if executing long request, which may end up
-; being interrupted by the user or a browser timing out.
-; ignore_user_abort = On
-
-; Determines the size of the realpath cache to be used by PHP. This value should
-; be increased on systems where PHP opens many files to reflect the quantity of
-; the file operations performed.
-; realpath_cache_size=16k
-
-; Duration of time, in seconds for which to cache realpath information for a given
-; file or directory. For systems with rarely changing files, consider increasing this
-; value.
-; realpath_cache_ttl=120
-
-;
-; Misc
-;
-; Decides whether PHP may expose the fact that it is installed on the server
-; (e.g. by adding its signature to the Web server header). It is no security
-; threat in any way, but it makes it possible to determine whether you use PHP
-; on your server or not.
-expose_php = On
-
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
-max_execution_time = 30 ; Maximum execution time of each script, in seconds
-max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
-memory_limit = 140M ; Maximum amount of memory a script may consume (16MB)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; error_reporting is a bit-field. Or each number up to get desired error
-; reporting level
-; E_ALL - All errors and warnings (doesn't include E_STRICT)
-; E_ERROR - fatal run-time errors
-; E_RECOVERABLE_ERROR - almost fatal run-time errors
-; E_WARNING - run-time warnings (non-fatal errors)
-; E_PARSE - compile-time parse errors
-; E_NOTICE - run-time notices (these are warnings which often result
-; from a bug in your code, but it's possible that it was
-; intentional (e.g., using an uninitialized variable and
-; relying on the fact it's automatically initialized to an
-; empty string)
-; E_STRICT - run-time notices, enable to have PHP suggest changes
-; to your code which will ensure the best interoperability
-; and forward compatibility of your code
-; E_CORE_ERROR - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's
-; initial startup
-; E_COMPILE_ERROR - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR - user-generated error message
-; E_USER_WARNING - user-generated warning message
-; E_USER_NOTICE - user-generated notice message
-;
-; Examples:
-;
-; - Show all errors, except for notices and coding standards warnings
-;
-;error_reporting = E_ALL & ~E_NOTICE
-;
-; - Show all errors, except for notices
-;
-;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
-;
-; - Show only errors
-;
-;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
-;
-; - Show all errors, except coding standards warnings
-;
-error_reporting = E_ALL
-
-; Print out errors (as a part of the output). For production web sites,
-; you're strongly encouraged to turn this feature off, and use error logging
-; instead (see below). Keeping display_errors enabled on a production web site
-; may reveal security information to end users, such as file paths on your Web
-; server, your database schema or other information.
-display_errors = Off
-
-; Even when display_errors is on, errors that occur during PHP's startup
-; sequence are not displayed. It's strongly recommended to keep
-; display_startup_errors off, except for when debugging.
-display_startup_errors = Off
-
-; Log errors into a log file (server-specific log, stderr, or error_log (below))
-; As stated above, you're strongly advised to use error logging in place of
-; error displaying on production web sites.
-log_errors = On
-
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-log_errors_max_len = 0
-
-; Do not log repeated messages. Repeated errors must occur in same file on same
-; line until ignore_repeated_source is set true.
-ignore_repeated_errors = Off
-
-; Ignore source of message when ignoring repeated messages. When this setting
-; is On you will not log errors with repeated messages from different files or
-; source lines.
-ignore_repeated_source = Off
-
-; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This has only effect in a debug compile, and if
-; error reporting includes E_WARNING in the allowed list
-report_memleaks = On
-
-;report_zend_debug = 0
-
-; Store the last error/warning message in $php_errormsg (boolean).
-track_errors = Off
-
-; Disable the inclusion of HTML tags in error messages.
-; Note: Never use this feature for production boxes.
-;html_errors = Off
-
-; If html_errors is set On PHP produces clickable error messages that direct
-; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
-; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
-; the dot.
-; Note: Never use this feature for production boxes.
-;docref_root = "/phpmanual/"
-;docref_ext = .html
-
-; String to output before an error message.
-;error_prepend_string = ""
-
-; String to output after an error message.
-;error_append_string = ""
-
-; Log errors to specified file.
-;error_log = filename
-
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
-;error_log = syslog
-
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
-
-; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
-;arg_separator.output = "&"
-
-; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
-; NOTE: Every character in this directive is considered as separator!
-;arg_separator.input = ";&"
-
-; This directive describes the order in which PHP registers GET, POST, Cookie,
-; Environment and Built-in variables (G, P, C, E & S respectively, often
-; referred to as EGPCS or GPC). Registration is done from left to right, newer
-; values override older values.
-variables_order = "EGPCS"
-
-; Whether or not to register the EGPCS variables as global variables. You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data. This makes most sense when coupled with track_vars - in which
-; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-; variables.
-;
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on; Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-register_globals = Off
-
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends. If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = Off
-
-; This directive tells PHP whether to declare the argv&argc variables (that
-; would contain the GET information). If you don't use these variables, you
-; should turn it off for increased performance.
-register_argc_argv = Off
-
-; When enabled, the SERVER and ENV variables are created when they're first
-; used (Just In Time) instead of when the script starts. If these variables
-; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives register_globals, register_long_arrays,
-; and register_argc_argv must be disabled for this directive to have any affect.
-auto_globals_jit = On
-
-; Maximum size of POST data that PHP will accept.
-post_max_size = 120M
-
-; Magic quotes
-;
-
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = Off
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
-magic_quotes_sybase = Off
-
-; Automatically add files before or after any PHP document.
-auto_prepend_file =
-auto_append_file =
-
-; As of 4.0b4, PHP always outputs a character encoding by default in
-; the Content-type: header. To disable sending of the charset, simply
-; set it to be empty.
-;
-; PHP's built-in default is text/html
-default_mimetype = "text/html"
-;default_charset = "iso-8859-1"
-
-; Always populate the $HTTP_RAW_POST_DATA variable.
-;always_populate_raw_post_data = On
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-
-; The root of the PHP pages, used only if nonempty.
-; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-; if you are running php as a CGI under any web server (other than IIS)
-; see documentation for security issues. The alternate is to use the
-; cgi.force_redirect configuration below
-doc_root =
-
-; The directory under which PHP opens the script using /~username used only
-; if nonempty.
-user_dir =
-
-; Directory in which the loadable extensions (modules) reside.
-{% if ansible_userspace_bits == "64" %}
-extension_dir = "/usr/lib64/php/modules"
-{% else %}
-extension_dir = "/usr/lib/php/modules"
-{% endif %}
-
-; Whether or not to enable the dl() function. The dl() function does NOT work
-; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-; disabled on them.
-enable_dl = On
-
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers. Left undefined, PHP turns this on by default. You can
-; turn it off here AT YOUR OWN RISK
-; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; cgi.force_redirect = 1
-
-; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-; every request.
-; cgi.nph = 1
-
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-; will look for to know it is OK to continue execution. Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; cgi.redirect_status_env = ;
-
-; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
-; security tokens of the calling client. This allows IIS to define the
-; security context that the request runs under. mod_fastcgi under Apache
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS. Default is zero.
-; fastcgi.impersonate = 1;
-
-; Disable logging through FastCGI connection
-; fastcgi.log = 0
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
-; is supported by Apache. When this option is set to 1 PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-;cgi.rfc2616_headers = 0
-
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-; Whether to allow HTTP file uploads.
-file_uploads = On
-
-; Temporary directory for HTTP uploaded files (will use system default if not
-; specified).
-;upload_tmp_dir =
-
-; Maximum allowed size for uploaded files.
-upload_max_filesize = 110M
-
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
-
-; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
-allow_url_include = Off
-
-; Define the anonymous ftp password (your email address)
-;from="john@doe.com"
-
-; Define the User-Agent string
-; user_agent="PHP"
-
-; Default timeout for socket based streams (seconds)
-default_socket_timeout = 60
-
-; If your scripts have to deal with files from Macintosh systems,
-; or you are running on a Mac and need to deal with files from
-; unix or win32 systems, setting this flag will cause PHP to
-; automatically detect the EOL character in those files so that
-; fgets() and file() will work regardless of the source of the file.
-; auto_detect_line_endings = Off
-
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-; extension=modulename.extension
-;
-; For example:
-;
-; extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here. Specify the location of the extension with the
-; extension_dir directive above.
-
-
-;;;;
-; Note: packaged extension modules are now loaded via the .ini files
-; found in the directory /etc/php.d; these are loaded by default.
-;;;;
-
-
-;;;;;;;;;;;;;;;;;;;
-; Module Settings ;
-;;;;;;;;;;;;;;;;;;;
-
-[Date]
-; Defines the default timezone used by the date functions
-date.timezone = {{ local_tz }}
-
-;date.default_latitude = 31.7667
-;date.default_longitude = 35.2333
-
-;date.sunrise_zenith = 90.583333
-;date.sunset_zenith = 90.583333
-
-[filter]
-;filter.default = unsafe_raw
-;filter.default_flags =
-
-[iconv]
-;iconv.input_encoding = ISO-8859-1
-;iconv.internal_encoding = ISO-8859-1
-;iconv.output_encoding = ISO-8859-1
-
-[sqlite]
-;sqlite.assoc_case = 0
-
-[xmlrpc]
-;xmlrpc_error_number = 0
-;xmlrpc_errors = 0
-
-[Pcre]
-;PCRE library backtracking limit.
-;pcre.backtrack_limit=100000
-
-;PCRE library recursion limit.
-;Please note that if you set this value to a high number you may consume all
-;the available process stack and eventually crash PHP (due to reaching the
-;stack size limit imposed by the Operating System).
-;pcre.recursion_limit=100000
-
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables = Off
-
-[mail function]
-; For Win32 only.
-SMTP = localhost
-smtp_port = 25
-
-; For Win32 only.
-;sendmail_from = me@example.com
-
-; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
-sendmail_path = /usr/sbin/sendmail -t -i
-
-; Force the addition of the specified parameters to be passed as extra parameters
-; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
-;mail.force_extra_parameters =
-
-[SQL]
-sql.safe_mode = Off
-
-[ODBC]
-;odbc.default_db = Not yet implemented
-;odbc.default_user = Not yet implemented
-;odbc.default_pw = Not yet implemented
-
-; Allow or prevent persistent links.
-odbc.allow_persistent = On
-
-; Check that a connection is still valid before reuse.
-odbc.check_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-odbc.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-odbc.max_links = -1
-
-; Handling of LONG fields. Returns number of bytes to variables. 0 means
-; passthru.
-odbc.defaultlrl = 4096
-
-; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
-; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of uodbc.defaultlrl and uodbc.defaultbinmode
-odbc.defaultbinmode = 1
-
-[MySQL]
-; Allow or prevent persistent links.
-mysql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-mysql.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-mysql.max_links = -1
-
-; Default port number for mysql_connect(). If unset, mysql_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
-; at MYSQL_PORT.
-mysql.default_port =
-
-; Default socket name for local MySQL connects. If empty, uses the built-in
-; MySQL defaults.
-mysql.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysql.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysql.default_user =
-
-; Default password for mysql_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password")
-; and reveal this password! And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysql.default_password =
-
-; Maximum time (in seconds) for connect timeout. -1 means no limit
-mysql.connect_timeout = 60
-
-; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-; SQL-Errors will be displayed.
-mysql.trace_mode = Off
-
-[MySQLi]
-
-; Maximum number of links. -1 means no limit.
-mysqli.max_links = -1
-
-; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
-; at MYSQL_PORT.
-mysqli.default_port = 3306
-
-; Default socket name for local MySQL connects. If empty, uses the built-in
-; MySQL defaults.
-mysqli.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysqli.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysqli.default_user =
-
-; Default password for mysqli_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
-; and reveal this password! And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysqli.default_pw =
-
-; Allow or prevent reconnect
-mysqli.reconnect = Off
-
-[mSQL]
-; Allow or prevent persistent links.
-msql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-msql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-msql.max_links = -1
-
-[PostgresSQL]
-; Allow or prevent persistent links.
-pgsql.allow_persistent = On
-
-; Detect broken persistent links always with pg_pconnect().
-; Auto reset feature requires a little overheads.
-pgsql.auto_reset_persistent = Off
-
-; Maximum number of persistent links. -1 means no limit.
-; This value is per-process - we want a 1:1 pairing between apache/php and pg
-; so we can keep memory usage under control.
-pgsql.max_persistent = 1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-pgsql.max_links = -1
-
-; Ignore PostgreSQL backends Notice message or not.
-; Notice message logging require a little overheads.
-pgsql.ignore_notice = 0
-
-; Log PostgreSQL backends Noitce message or not.
-; Unless pgsql.ignore_notice=0, module cannot log notice message.
-pgsql.log_notice = 0
-
-[Sybase]
-; Allow or prevent persistent links.
-sybase.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-sybase.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-sybase.max_links = -1
-
-;sybase.interface_file = "/usr/sybase/interfaces"
-
-; Minimum error severity to display.
-sybase.min_error_severity = 10
-
-; Minimum message severity to display.
-sybase.min_message_severity = 10
-
-; Compatibility mode with old versions of PHP 3.0.
-; If on, this will cause PHP to automatically assign types to results according
-; to their Sybase type, instead of treating them all as strings. This
-; compatibility mode will probably not stay around forever, so try applying
-; whatever necessary changes to your code, and turn it off.
-sybase.compatability_mode = Off
-
-[Sybase-CT]
-; Allow or prevent persistent links.
-sybct.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-sybct.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-sybct.max_links = -1
-
-; Minimum server message severity to display.
-sybct.min_server_severity = 10
-
-; Minimum client message severity to display.
-sybct.min_client_severity = 10
-
-[bcmath]
-; Number of decimal digits for all bcmath functions.
-bcmath.scale = 0
-
-[browscap]
-;browscap = extra/browscap.ini
-
-[Informix]
-; Default host for ifx_connect() (doesn't apply in safe mode).
-ifx.default_host =
-
-; Default user for ifx_connect() (doesn't apply in safe mode).
-ifx.default_user =
-
-; Default password for ifx_connect() (doesn't apply in safe mode).
-ifx.default_password =
-
-; Allow or prevent persistent links.
-ifx.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-ifx.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-ifx.max_links = -1
-
-; If on, select statements return the contents of a text blob instead of its id.
-ifx.textasvarchar = 0
-
-; If on, select statements return the contents of a byte blob instead of its id.
-ifx.byteasvarchar = 0
-
-; Trailing blanks are stripped from fixed-length char columns. May help the
-; life of Informix SE users.
-ifx.charasvarchar = 0
-
-; If on, the contents of text and byte blobs are dumped to a file instead of
-; keeping them in memory.
-ifx.blobinfile = 0
-
-; NULL's are returned as empty strings, unless this is set to 1. In that case,
-; NULL's are returned as string 'NULL'.
-ifx.nullformat = 0
-
-[Session]
-; Handler used to store/retrieve data.
-session.save_handler = files
-
-; Argument passed to save_handler. In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
-; variable in order to use PHP's session functions.
-;
-; As of PHP 4.0.1, you can define the path as:
-;
-; session.save_path = "N;/path"
-;
-; where N is an integer. Instead of storing all the session files in
-; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories. This is useful if you
-; or your OS have problems with lots of files in one directory, and is
-; a more efficient layout for servers that handle lots of sessions.
-;
-; NOTE 1: PHP will not create this directory structure automatically.
-; You can use the script in the ext/session dir for that purpose.
-; NOTE 2: See the section on garbage collection below if you choose to
-; use subdirectories for session storage
-;
-; The file storage module creates files using mode 600 by default.
-; You can change that by using
-;
-; session.save_path = "N;MODE;/path"
-;
-; where MODE is the octal representation of the mode. Note that this
-; does not overwrite the process's umask.
-session.save_path = "/var/lib/php/session"
-
-; Whether to use cookies.
-session.use_cookies = 1
-
-; This option enables administrators to make their users invulnerable to
-; attacks which involve passing session ids in URLs; defaults to 0.
-; session.use_only_cookies = 1
-
-; Name of the session (used as cookie name).
-session.name = PHPSESSID
-
-; Initialize session on request startup.
-session.auto_start = 0
-
-; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-session.cookie_lifetime = 0
-
-; The path for which the cookie is valid.
-session.cookie_path = /
-
-; The domain for which the cookie is valid.
-session.cookie_domain =
-
-; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
-session.cookie_httponly =
-
-; Handler used to serialize data. php is the standard serializer of PHP.
-session.serialize_handler = php
-
-; Define the probability that the 'garbage collection' process is started
-; on every session initialization.
-; The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts
-; on each request.
-
-session.gc_probability = 1
-session.gc_divisor = 1000
-
-; After this number of seconds, stored data will be seen as 'garbage' and
-; cleaned up by the garbage collection process.
-session.gc_maxlifetime = 1440
-
-; NOTE: If you are using the subdirectory option for storing session files
-; (see session.save_path above), then garbage collection does *not*
-; happen automatically. You will need to do your own garbage
-; collection through a shell script, cron entry, or some other method.
-; For example, the following script would is the equivalent of
-; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-; cd /path/to/sessions; find -cmin +24 | xargs rm
-
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, albeit register_globals
-; is disabled. PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled.
-
-session.bug_compat_42 = 0
-session.bug_compat_warn = 1
-
-; Check HTTP Referer to invalidate externally stored URLs containing ids.
-; HTTP_REFERER has to contain this substring for the session to be
-; considered as valid.
-session.referer_check =
-
-; How many bytes to read from the file.
-session.entropy_length = 0
-
-; Specified here to create the session id.
-session.entropy_file =
-
-;session.entropy_length = 16
-
-;session.entropy_file = /dev/urandom
-
-; Set to {nocache,private,public,} to determine HTTP caching aspects
-; or leave this empty to avoid sending anti-caching headers.
-session.cache_limiter = nocache
-
-; Document expires after n minutes.
-session.cache_expire = 180
-
-; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
-; Use this option with caution.
-; - User may send URL contains active session ID
-; to other person via. email/irc/etc.
-; - URL that contains active session ID may be stored
-; in publically accessible computer.
-; - User may access your site with the same session ID
-; always using URL stored in browser's history or bookmarks.
-session.use_trans_sid = 0
-
-; Select a hash function
-; 0: MD5 (128 bits)
-; 1: SHA-1 (160 bits)
-session.hash_function = 0
-
-; Define how many bits are stored in each character when converting
-; the binary hash data to something readable.
-;
-; 4 bits: 0-9, a-f
-; 5 bits: 0-9, a-v
-; 6 bits: 0-9, a-z, A-Z, "-", ","
-session.hash_bits_per_character = 5
-
-; The URL rewriter will look for URLs in a defined set of HTML tags.
-; form/fieldset are special; if you include them here, the rewriter will
-; add a hidden field with the info which is otherwise appended
-; to URLs. If you want XHTML conformity, remove the form entry.
-; Note that all valid entries require a "=", even if no value follows.
-url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
-
-[MSSQL]
-; Allow or prevent persistent links.
-mssql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-mssql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-mssql.max_links = -1
-
-; Minimum error severity to display.
-mssql.min_error_severity = 10
-
-; Minimum message severity to display.
-mssql.min_message_severity = 10
-
-; Compatibility mode with old versions of PHP 3.0.
-mssql.compatability_mode = Off
-
-; Connect timeout
-;mssql.connect_timeout = 5
-
-; Query timeout
-;mssql.timeout = 60
-
-; Valid range 0 - 2147483647. Default = 4096.
-;mssql.textlimit = 4096
-
-; Valid range 0 - 2147483647. Default = 4096.
-;mssql.textsize = 4096
-
-; Limits the number of records in each batch. 0 = all records in one batch.
-;mssql.batchsize = 0
-
-; Specify how datetime and datetim4 columns are returned
-; On => Returns data converted to SQL server settings
-; Off => Returns values as YYYY-MM-DD hh:mm:ss
-;mssql.datetimeconvert = On
-
-; Use NT authentication when connecting to the server
-mssql.secure_connection = Off
-
-; Specify max number of processes. -1 = library default
-; msdlib defaults to 25
-; FreeTDS defaults to 4096
-;mssql.max_procs = -1
-
-; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
-; This is only used when compiled with FreeTDS
-;mssql.charset = "ISO-8859-1"
-
-[Assertion]
-; Assert(expr); active by default.
-;assert.active = On
-
-; Issue a PHP warning for each failed assertion.
-;assert.warning = On
-
-; Don't bail out by default.
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-;assert.callback = 0
-
-; Eval the expression with current error_reporting(). Set to true if you want
-; error_reporting(0) around the eval().
-;assert.quiet_eval = 0
-
-[COM]
-; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-;com.typelib_file =
-; allow Distributed-COM calls
-;com.allow_dcom = true
-; autoregister constants of a components typlib on com_load()
-;com.autoregister_typelib = true
-; register constants casesensitive
-;com.autoregister_casesensitive = false
-; show warnings on duplicate constant registrations
-;com.autoregister_verbose = true
-
-[mbstring]
-; language for internal character representation.
-;mbstring.language = Japanese
-
-; internal/script encoding.
-; Some encoding cannot work as internal encoding.
-; (e.g. SJIS, BIG5, ISO-2022-*)
-;mbstring.internal_encoding = EUC-JP
-
-; http input encoding.
-;mbstring.http_input = auto
-
-; http output encoding. mb_output_handler must be
-; registered as output buffer to function
-;mbstring.http_output = SJIS
-
-; enable automatic encoding translation according to
-; mbstring.internal_encoding setting. Input chars are
-; converted to internal encoding by setting this to On.
-; Note: Do _not_ use automatic encoding translation for
-; portable libs/applications.
-;mbstring.encoding_translation = Off
-
-; automatic encoding detection order.
-; auto means
-;mbstring.detect_order = auto
-
-; substitute_character used when character cannot be converted
-; one from another
-;mbstring.substitute_character = none;
-
-; overload(replace) single byte functions by mbstring functions.
-; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
-; etc. Possible values are 0,1,2,4 or combination of them.
-; For example, 7 for overload everything.
-; 0: No overload
-; 1: Overload mail() function
-; 2: Overload str*() functions
-; 4: Overload ereg*() functions
-;mbstring.func_overload = 0
-
-; enable strict encoding detection.
-;mbstring.strict_encoding = Off
-
-[FrontBase]
-;fbsql.allow_persistent = On
-;fbsql.autocommit = On
-;fbsql.show_timestamp_decimals = Off
-;fbsql.default_database =
-;fbsql.default_database_password =
-;fbsql.default_host =
-;fbsql.default_password =
-;fbsql.default_user = "_SYSTEM"
-;fbsql.generate_warnings = Off
-;fbsql.max_connections = 128
-;fbsql.max_links = 128
-;fbsql.max_persistent = -1
-;fbsql.max_results = 128
-
-[gd]
-; Tell the jpeg decode to libjpeg warnings and try to create
-; a gd image. The warning will then be displayed as notices
-; disabled by default
-;gd.jpeg_ignore_warning = 0
-
-[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
-; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
-; intel byte order. A decode setting cannot be empty.
-;exif.encode_unicode = ISO-8859-15
-;exif.decode_unicode_motorola = UCS-2BE
-;exif.decode_unicode_intel = UCS-2LE
-;exif.encode_jis =
-;exif.decode_jis_motorola = JIS
-;exif.decode_jis_intel = JIS
-
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-tidy.clean_output = Off
-
-[soap]
-; Enables or disables WSDL caching feature.
-soap.wsdl_cache_enabled=1
-; Sets the directory name where SOAP extension will put cache files.
-soap.wsdl_cache_dir="/tmp"
-; (time to live) Sets the number of second while cached file will be used
-; instead of original one.
-soap.wsdl_cache_ttl=86400
-
-; Local Variables:
-; tab-width: 4
-; End:
diff --git a/roles/kalite/tasks/assessment.yml.deprecated b/roles/kalite/tasks/assessment.yml.deprecated
deleted file mode 100644
index 73faec727..000000000
--- a/roles/kalite/tasks/assessment.yml.deprecated
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is for an OS other than Fedora 18
-
-# The stock install puts a small /library/ka-lite/content/assessmentitems.sqlite file, so use size instead of exists
-- name: See if assessment is already installed
- stat: path="{{ kalite_root }}/content/assessment/khan/assessmentitems.sqlite"
- register: khan_assessment_installed
-
-- name: Run the assessment setup using kalite manage
- command: "{{ kalite_program }} manage unpack_assessment_zip {{ downloads_dir }}/khan_assessment.zip"
- environment:
- KALITE_HOME: "{{ kalite_root }}"
- async: 900
- poll: 10
- when: not khan_assessment_installed.stat.exists or khan_assessment_installed.stat.size < 20000
diff --git a/roles/kalite/templates/settings.py.j2.deprecated b/roles/kalite/templates/settings.py.j2.deprecated
deleted file mode 100644
index 0799f934b..000000000
--- a/roles/kalite/templates/settings.py.j2.deprecated
+++ /dev/null
@@ -1,3 +0,0 @@
-from kalite.project.settings.base import *
-LANGUAGE_CODE = "{{ default_language }}"
-ASSESSMENT_ITEMS_ZIP_URL = "scheme://{{ downloads_dir }}/khan_assessment.zip"
diff --git a/roles/kiwix/templates/iiab-make-kiwix-lib.py.deprecated b/roles/kiwix/templates/iiab-make-kiwix-lib.py.deprecated
deleted file mode 100755
index 200e9324c..000000000
--- a/roles/kiwix/templates/iiab-make-kiwix-lib.py.deprecated
+++ /dev/null
@@ -1,326 +0,0 @@
-#!/usr/bin/python3
-
-"""
-
- Creates temp library.xml file for kiwix from contents of /zims/content and index
- Updated to handle incremental additions and deletions
-
- Author: Tim Moody
- Contributors: Jerry Vonau
-
-"""
-
-import os, sys, syslog
-import pwd, grp
-import time
-from datetime import date, datetime
-import json
-import yaml
-import re
-import subprocess
-import shlex
-#import ConfigParser
-import configparser
-import xml.etree.ElementTree as ET
-import argparse
-import fnmatch
-
-IIAB_PATH='/etc/iiab'
-if not IIAB_PATH in sys.path:
- sys.path.append(IIAB_PATH)
-from iiab_env import get_iiab_env
-KIWIX_CAT = IIAB_PATH + '/kiwix_catalog.json'
-
-# Config Files
-# iiab_ini_file should be in {{ iiab_env_file }} (/etc/iiab/iiab.env) ?
-#iiab_ini_file = "{{ iiab_ini_file }}" # nominally /etc/iiab/iiab.ini
-iiab_ini_file = "/etc/iiab/iiab.ini" # comment out after testing
-
-IIAB_INI = get_iiab_env('IIAB_INI') # future
-if IIAB_INI:
- iiab_ini_file = IIAB_INI
-
-# Variables that should be read from config file
-# All of these variables will be read from config files and recomputed in init()
-zim_path = "/library/zims"
-
-iiab_base_path = "/opt/iiab"
-kiwix_manage = iiab_base_path + "/kiwix/bin/kiwix-manage"
-doc_root = get_iiab_env('WWWROOT')
-zim_version_idx_dir = doc_root + "/common/assets/"
-zim_version_idx_file = "zim_version_idx.json"
-#zim_version_idx_file = "zim_version_idx_test.json"
-menuDefs = doc_root + "/js-menu/menu-files/menu-defs/"
-menuImages = doc_root + "/js-menu/menu-files/images/"
-menuJsonPath = doc_root + "/home/menu.json"
-
-assets_dir = doc_root + "/common/assets/"
-lang_codes_path = assets_dir + "lang_codes.json"
-lang_codes = {}
-old_zim_map = {"bad.zim" : "unparseable name"}
-
-# Working variables
-# zim_files - list of zims and possible index from file system
-# path_to_id_map - list of zims in current library.xml with id (for delete)
-zim_versions = {} # map of zim's generic name to version installed, e.g. wikipedia_es_all to wikipedia_es_all_2017-01
-
-def main():
- """Server routine"""
- global kiwix_library_xml
- global zim_path
- global zim_version_idx_dir
- global zim_version_idx_file
-
- init()
- args = parse_args()
- if args.device: # allow override of path
- zim_path = args.device + zim_path
- zim_version_idx_dir = args.device + zim_version_idx_dir
-
- kiwix_library_xml = zim_path + "/library.xml"
- if not args.no_tmp: # don't append .tmp
- kiwix_library_xml += ".tmp"
-
- # remove existing file if force
- if args.force:
- try:
- os.remove(kiwix_library_xml)
- except OSError:
- pass
- zims_installed = {}
- path_to_id_map = {}
- else:
- zims_installed, path_to_id_map = read_library_xml(kiwix_library_xml)
-
- zim_files = get_zim_list(zim_path)
-
- # Remove zims not in file system from library.xml
- remove_list_str = ""
- for item in path_to_id_map:
- if item not in zim_files:
- rem_libr_xml(path_to_id_map[item])
-
- # Add zims from file system that are not in library.xml
- for item in zim_files:
- if item not in path_to_id_map:
- add_libr_xml(kiwix_library_xml, zim_path, item, zim_files[item])
-
- print("Writing zim_versions_idx")
- write_zim_versions_idx()
- sys.exit()
-
-def get_zim_list(path):
- files_processed = {}
- zim_list = []
- content = path + "/content/"
- index = path + "/index/"
- flist = os.listdir(content)
- flist.sort()
- for filename in flist:
- zimpos = filename.find(".zim")
- if zimpos != -1:
- zim_info = {}
- filename = filename[:zimpos]
- zimname = "content/" + filename + ".zim"
- zimidx = "index/" + filename + ".zim.idx"
- if zimname not in files_processed:
- if not os.path.isdir (path + "/" + zimidx): # only declare index if exists (could be embedded)
- zimidx = None
- files_processed[zimname] = zimidx
- zimname = content + filename + ".zim"
- zimidx = index + filename + ".zim.idx"
- if filename in old_zim_map: # handle old names that don't parse
- wiki_name = old_zim_map[filename]
- else:
- ulpos = filename.rfind("_")
- # but old gutenberg and some other names are not canonical
- if filename.rfind("-") < 0: # non-canonical name
- ulpos = filename[:ulpos].rfind("_")
- wiki_name = filename[:ulpos]
- zim_info['file_name'] = filename
- zim_versions[wiki_name] = zim_info # if there are multiples, last should win
- return files_processed
-
-def read_library_xml(lib_xml_file, kiwix_exclude_attr=[""]): # duplicated from iiab-cmdsrv
- kiwix_exclude_attr.append("id") # don't include id
- kiwix_exclude_attr.append("favicon") # don't include large favicon
- zims_installed = {}
- path_to_id_map = {}
- try:
- tree = ET.parse(lib_xml_file)
- root = tree.getroot()
- xml_item_no = 0
- for child in root:
- #xml_item_no += 1 # hopefully this is the array number
- attributes = {}
- if 'id' not in child.attrib: # is this necessary? implies there are records with no book id which would break index for removal
- print ("xml record missing Book Id")
- id = child.attrib['id']
- for attr in child.attrib:
- if attr not in kiwix_exclude_attr:
- attributes[attr] = child.attrib[attr] # copy if not id or in exclusion list
- zims_installed[id] = attributes
- path_to_id_map[child.attrib['path']] = id
- except IOError:
- zims_installed = {}
- return zims_installed, path_to_id_map
-
-def rem_libr_xml(id):
- command = kiwix_manage + " " + kiwix_library_xml + " remove " + id
- #print command
- args = shlex.split(command)
- try:
- outp = subprocess.check_output(args)
- except subprocess.CalledProcessError as e:
- if e.returncode != 2: # skip bogus file open error in kiwix-manage
- print (outp)
-
-def add_libr_xml(kiwix_library_xml, zim_path, zimname, zimidx):
- command = kiwix_manage + " " + kiwix_library_xml + " add " + zim_path + "/" + zimname
- if zimidx:
- command += " -i " + zim_path + "/" + zimidx
- #print command
- args = shlex.split(command)
- try:
- outp = subprocess.check_output(args)
-
- except: #skip things that don't work
- #print 'skipping ' + zimname
- pass
-
-def read_lang_codes():
- global lang_codes
- with open(lang_codes_path,"r") as f:
- reads = f.read()
- #print("menu.json:%s"%reads)
- lang_codes = json.loads(reads)
-
-def kiwix_lang_to_iso2(zim_lang_code):
- return lang_codes[zim_lang_code]['iso2']
-
-def init():
-
- global iiab_base_path
- global zim_path
- global kiwix_library_xml
- global kiwix_manage
-
-# config = ConfigParser.SafeConfigParser()
- config = configparser.ConfigParser()
- config.read(iiab_ini_file)
- iiab_base_path = config.get('location','iiab_base')
- zim_path = config.get('kiwix','iiab_zim_path')
- kiwix_library_xml = config.get('kiwix','kiwix_library_xml')
- kiwix_manage = iiab_base_path + "/kiwix/bin/kiwix-manage"
- read_lang_codes()
-
-def parse_args():
- parser = argparse.ArgumentParser(description="Create library.xml for Kiwix.")
- parser.add_argument("--device", help="no trailing /. change the target device from internal storage to something else like /media/usb0")
- parser.add_argument("--no_tmp", help="don't append .tmp to the library.xml name", action="store_true")
- parser.add_argument("-f", "--force", help="force complete rebuild of library.xml", action="store_true")
- parser.add_argument("-v", "--verbose", help="Print messages.", action="store_true")
- return parser.parse_args()
-
-def write_zim_versions_idx():
- global zim_versions
- zims_installed,path_to_id_map = read_library_xml(kiwix_library_xml)
- for perma_ref in zim_versions:
- zim_versions[perma_ref]['menu_item'] = find_menuitem_from_zimname(perma_ref)
- articlecount,mediacount,size,tags,lang,date = \
- get_substitution_data(perma_ref, zims_installed, path_to_id_map)
- zim_versions[perma_ref]['article_count'] = articlecount
- zim_versions[perma_ref]['media_count'] = mediacount
- size = human_readable(float(size) * 1024) # kiwix reports in K
- zim_versions[perma_ref]['size'] = size
- zim_versions[perma_ref]['tags'] = tags
-
- zim_versions[perma_ref]['language'] = lang
- zim_versions[perma_ref]['zim_date'] = date
-
- # Write Version Map
- if os.path.isdir(zim_version_idx_dir):
- with open(zim_version_idx_dir + zim_version_idx_file, 'w') as fp:
- fp.write(json.dumps(zim_versions,indent=2 ))
- fp.close()
- else:
- print (zim_version_idx_dir + " not found.")
-
-def get_substitution_data(perma_ref,zims_installed, path_to_id_map):
- #reconstruct the path in the id map
- path = 'content/' + zim_versions[perma_ref]['file_name'] + '.zim'
- id = path_to_id_map[path]
- item = zims_installed[id]
-
- if len(item) != 0 or perma_ref == 'test':
- mediacount = item.get('mediaCount','')
- articlecount = item.get('articleCount','')
- size = item.get('size','')
- tags = item.get('tags','')
- zim_lang = item.get('language')
- menu_def_lang = kiwix_lang_to_iso2(zim_lang)
- date = item.get('date','')
- return (articlecount,mediacount,size,tags,menu_def_lang,date)
- return ('0','0','0','0','0','0')
-
-def get_menu_def_zimnames(intended_use='zim'):
- menu_def_dict = {}
- os.chdir(menuDefs)
- for filename in os.listdir('.'):
- if fnmatch.fnmatch(filename, '*.json'):
- try:
- with open(filename,'r') as json_file:
- readstr = json_file.read()
- data = json.loads(readstr)
- except:
- print("failed to parse %s"%filename)
- print(readstr)
- if data.get('intended_use','') != 'zim':
- continue
- zimname = data.get('zim_name','')
- if zimname != '':
- menu_def_dict[data['zim_name']] = menuDefs + filename
- return menu_def_dict
-
-def find_menuitem_from_zimname(zimname):
- defs = get_menu_def_zimnames()
- defs_filename = defs.get(zimname,'')
- if defs_filename != '':
- #print("reading menu-def:%s"%defs_filename)
- with open(defs_filename,'r') as json_file:
- readstr = json_file.read()
- data = json.loads(readstr)
- return data.get('menu_item_name','')
- return ''
-
-def get_kiwix_catalog_item(perma_ref):
- # Read the kiwix catalog
- with open(KIWIX_CAT, 'r') as kiwix_cat:
- json_data = kiwix_cat.read()
- download = json.loads(json_data)
- zims = download['zims']
- for uuid in zims.keys():
- #print("%s %s"%(zims[uuid]['perma_ref'],perma_ref,))
- if zims[uuid]['perma_ref'] == perma_ref:
- return zims[uuid]
- return {}
-
-def human_readable(num):
- # return 3 significant digits and unit specifier
- # TFM 7/15/2019 change to factor of 1024, not 1000 to match similar calcs elsewhere
- num = float(num)
- units = [ '','K','M','G']
- for i in range(4):
- if num<10.0:
- return "%.2f%s"%(num,units[i])
- if num<100.0:
- return "%.1f%s"%(num,units[i])
- if num < 1000.0:
- return "%.0f%s"%(num,units[i])
- num /= 1024.0
-
-# Now start the application
-if __name__ == "__main__":
-
- # Run the main routine
- main()
diff --git a/roles/network/tasks/create_ifcfg.yml.deprecated b/roles/network/tasks/create_ifcfg.yml.deprecated
deleted file mode 100644
index 7c982dbd2..000000000
--- a/roles/network/tasks/create_ifcfg.yml.deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-- name: Stop 'Wired WAN connection'
- shell: nmcli dev disconnect {{ discovered_wan_iface }}
- ignore_errors: True
- changed_when: False
- when: discovered_wan_iface != "none" and not has_WAN and has_ifcfg_gw == "none"
-
-# set user_wan_iface: for static
-# use wan_* for static info
-- name: Supply ifcfg-WAN file
- template: src=network/ifcfg-WAN.j2
- dest=/etc/sysconfig/network-scripts/ifcfg-WAN
- when: iiab_wan_iface != "none" and not has_WAN and has_ifcfg_gw == "none"
-
-- name: Now setting ifcfg-WAN True after creating file
- set_fact:
- has_WAN: True
- when: iiab_wan_iface != "none" and has_ifcfg_gw == "none"
diff --git a/roles/network/tasks/hosts.yml.deprecated b/roles/network/tasks/hosts.yml.deprecated
deleted file mode 100644
index ce4a7467f..000000000
--- a/roles/network/tasks/hosts.yml.deprecated
+++ /dev/null
@@ -1,28 +0,0 @@
-# this (hosts.yml) WAS invoked by roles/network/tasks/main.yml up until 2019-12-10
-
-#TODO: Use vars instead of hardcoded values
-- name: Remove FQDN with 172.18.96.1 in /etc/hosts without LAN (if iiab_lan_iface == "none" and not installing)
- lineinfile:
- path: /etc/hosts
- regexp: '^172\.18\.96\.1'
- state: absent
- when: iiab_lan_iface == "none" and not installing
-
-- name: Configure FQDN with 172.18.96.1 in /etc/hosts with LAN (if iiab_lan_iface != "none" and not installing)
- lineinfile:
- path: /etc/hosts
- regexp: '^172\.18\.96\.1'
- line: '172.18.96.1 {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box box.lan'
- state: present
- when: not (iiab_lan_iface == "none") and not installing
-
-# roles/0-init/tasks/hostname.yml ALSO does this:
-- name: 'Put FQDN & hostnames in /etc/hosts: "127.0.0.1 {{ iiab_hostname }}.{{ iiab_domain }} localhost.localdomain localhost {{ iiab_hostname }} box box.lan" (if iiab_lan_iface == "none" and not installing, appliance mode?)'
- lineinfile:
- path: /etc/hosts
- regexp: '^127\.0\.0\.1'
- line: '127.0.0.1 {{ iiab_hostname }}.{{ iiab_domain }} localhost.localdomain localhost {{ iiab_hostname }} box box.lan'
- owner: root
- group: root
- mode: 0644
- when: iiab_lan_iface == "none" and not installing
diff --git a/roles/network/templates/network/iiab.j2.deprecated b/roles/network/templates/network/iiab.j2.deprecated
deleted file mode 100644
index 82e4689ba..000000000
--- a/roles/network/templates/network/iiab.j2.deprecated
+++ /dev/null
@@ -1,47 +0,0 @@
-# Generated by IIAB
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# iiab_network_mode is {{ gui_desired_network_role }}
-
-{% if discovered_wireless_iface != 'none' %}
-auto {{ discovered_wireless_iface }}
-iface {{ discovered_wireless_iface }} inet manual
-{% endif %}
-
-{% if iiab_network_mode == "Appliance" %}
-################# APPLIANCE #########################
-auto {{ discovered_wan_iface }}
-# if gui_static_wan == true dhcpcd.conf will be modified
-iface {{ discovered_wan_iface }} inet manual
-
-{% elif iiab_network_mode == "Gateway" %}
-################# GATEWAY #########################
-auto br0
-iface br0 inet static
- bridge_ports {% if discovered_wireless_iface != "none" %} {{ discovered_wireless_iface }} {% endif %} {% if discovered_lan_iface != "none" %} {{ discovered_lan_iface }} {% endif %}
-
- bridge_maxwait 0
- address {{ lan_ip }}
- netmask {{ lan_netmask }}
- dns-nameservers {{ lan_ip }}
-# change for debian 9, let dhcpcd.conf set the static ip
-# if gui_static_wan == True
-auto {{ discovered_wan_iface }}
-iface {{ discovered_wan_iface }} inet manual
-
-{% else %} {# end of iiab_network_mode == Gateway #}
-
-################# LANCONTROLLER ###################
-auto br0
-iface br0 inet static
- bridge_ports {% if discovered_wireless_iface != "none" %} {{ discovered_wireless_iface }} {% endif %} {% if discovered_wan_iface != "none" %} {{ discovered_wan_iface }} {% endif %}
-
- bridge_maxwait 0
- address {{ lan_ip }}
- netmask {{ lan_netmask }}
- gateway {{ lan_ip }}
- dns-nameservers {{ lan_ip }}
- dns-search {{ iiab_domain }}
- post-up systemctl restart dhcpd && systemctl restart hostapd
-{% endif %}
diff --git a/roles/nginx/tasks/disable.yml.deprecated b/roles/nginx/tasks/disable.yml.deprecated
deleted file mode 100644
index d2e8f7a06..000000000
--- a/roles/nginx/tasks/disable.yml.deprecated
+++ /dev/null
@@ -1,30 +0,0 @@
-#grep -r "not nginx_enabled" roles/
-#roles/calibre-web/tasks/main.yml: when: calibreweb_enabled and not nginx_enabled | bool
-#roles/calibre-web/tasks/main.yml: when: not nginx_enabled | bool
-#roles/kolibri/tasks/main.yml: when: kolibri_enabled and not nginx_enabled | bool
-#roles/kolibri/tasks/main.yml: when: not nginx_enabled | bool
-#roles/kiwix/tasks/kiwix_install.yml: when: kiwix_enabled and not nginx_enabled | bool
-#roles/kiwix/tasks/kiwix_install.yml: when: not nginx_enabled | bool
-#roles/nginx/tasks/main.yml: when: not nginx_enabled | bool
-#roles/nginx/tasks/main.yml: when: not nginx_enabled | bool
-#roles/sugarizer/tasks/install.yml: when: sugarizer_enabled and not nginx_enabled | bool
-#roles/sugarizer/tasks/install.yml: when: sugarizer_enabled and not nginx_enabled | bool
-
-- name: Enable Gitea for Apache
- command: a2ensite gitea.conf
-
-- name: Enable Calibre-Web for Apache
- command: a2ensite calibre-web.conf
-
-- name: Enable Kolibri for Apache
- command: a2ensite kolibri.conf
-
-- name: Enable kiwix for Apache
- command: a2ensite kiwix.conf
-
-- name: Enable Sugarizer for Apache
- command: a2ensite sugarizer.conf
-
-- name: Enable AWStats for Apache
- command: a2ensite awstats.conf
-
diff --git a/roles/nginx/tasks/only_nginx.yml.deprecated b/roles/nginx/tasks/only_nginx.yml.deprecated
deleted file mode 100644
index 47bc76e99..000000000
--- a/roles/nginx/tasks/only_nginx.yml.deprecated
+++ /dev/null
@@ -1,98 +0,0 @@
-# The ~100 lines of code below are near-identical to what's in tasks/enable.yml
-# for these 6 playbooks. Any way we can consolidate / reduce duplication?
-
-
-- name: Remove symlink /etc/apache2/sites-enabled/awstats.conf
- command: a2dissite awstats.conf
-
-- name: Install /etc/nginx/conf.d/awstats-nginx.conf from template, if awstats_enabled
- template:
- src: roles/awstats/templates/awstats-nginx.conf
- dest: /etc/nginx/conf.d/awstats-nginx.conf
- when: awstats_enabled | bool
-
-- name: Remove NGINX support for AWStats, if not awstats_enabled
- file:
- path: /etc/nginx/conf.d/awstats-nginx.conf
- state: absent
- when: not awstats_enabled
-
-
-- name: Remove symlink /etc/apache2/sites-enabled/calibre-web.conf
- command: a2dissite calibre-web.conf
-
-- name: Install /etc/nginx/conf.d/calibre-web-nginx.conf from template, if calibreweb_enabled
- template:
- src: roles/calibre-web/templates/calibre-web-nginx.conf.j2
- dest: /etc/nginx/conf.d/calibre-web-nginx.conf
- when: calibreweb_enabled | bool
-
-- name: Remove NGINX support for Calibre-Web, if not calibreweb_enabled
- file:
- path: /etc/nginx/conf.d/calibre-web-nginx.conf
- state: absent
- when: not calibreweb_enabled
-
-
-- name: Remove symlink /etc/apache2/sites-enabled/gitea.conf
- command: a2dissite gitea.conf
-
-- name: Install /etc/nginx/conf.d/gitea-nginx.conf from template, if gitea_enabled
- template:
- src: roles/gitea/templates/gitea-nginx.conf.j2
- dest: /etc/nginx/conf.d/gitea-nginx.conf
- when: gitea_enabled | bool
-
-- name: Remove NGINX support for Gitea, if not gitea_enabled
- file:
- path: /etc/nginx/conf.d/gitea-nginx.conf
- state: absent
- when: not gitea_enabled
-
-
-- name: Remove symlink /etc/apache2/sites-enabled/kiwix.conf
- command: a2dissite kiwix.conf
-
-- name: Install /etc/nginx/conf.d/kiwix-nginx.conf from template, if kiwix_enabled
- template:
- src: roles/kiwix/templates/kiwix-nginx.conf
- dest: /etc/nginx/conf.d/kiwix-nginx.conf
- when: kiwix_enabled | bool
-
-- name: Remove NGINX support for Kiwix, if not kiwix_enabled
- file:
- path: /etc/nginx/conf.d/kiwix-nginx.conf
- state: absent
- when: not kiwix_enabled
-
-
-- name: Remove symlink /etc/apache2/sites-enabled/kolibri.conf
- command: a2dissite kolibri.conf
-
-- name: Install /etc/nginx/conf.d/kolibri-nginx.conf from template, if kolibri_enabled
- template:
- src: roles/kolibri/templates/kolibri-nginx.conf.j2
- dest: /etc/nginx/conf.d/kolibri-nginx.conf
- when: kolibri_enabled | bool
-
-- name: Remove NGINX support for Kolibri, if not kolibri_enabled
- file:
- path: /etc/nginx/conf.d/kolibri-nginx.conf
- state: absent
- when: not kolibri_enabled
-
-
-- name: Remove symlink /etc/apache2/sites-enabled/sugarizer.conf
- command: a2dissite sugarizer.conf
-
-- name: Install /etc/nginx/conf.d/sugarizer-nginx.conf from template, if sugarizer_enabled
- template:
- src: roles/sugarizer/templates/sugarizer-nginx.conf
- dest: /etc/nginx/conf.d/sugarizer-nginx.conf
- when: sugarizer_enabled | bool
-
-- name: Remove NGINX support for Sugarizer, if not sugarizer_enabled
- file:
- path: /etc/nginx/conf.d/sugarizer-nginx.conf
- state: absent
- when: not sugarizer_enabled
diff --git a/roles/nginx/tasks/uses_apache.yml.deprecated b/roles/nginx/tasks/uses_apache.yml.deprecated
deleted file mode 100644
index 6a6356ad9..000000000
--- a/roles/nginx/tasks/uses_apache.yml.deprecated
+++ /dev/null
@@ -1,56 +0,0 @@
-# The ~40 lines of code below are near-identical to what's in tasks/enable.yml
-# for these 6 playbooks. Any way PR #2131 etc can help reduce duplication?
-
-
-- name: Install {{ nginx_conf_dir }}/dokuwiki-nginx.conf from template, if dokuwiki_enabled
- template:
- src: dokuwiki-nginx.conf
- dest: "{{ nginx_conf_dir }}/dokuwiki-nginx.conf" # /etc/nginx/conf.d
- when: dokuwiki_enabled | bool
-
-- name: Install {{ nginx_conf_dir }}/elgg-nginx.conf from template, if elgg_enabled
- template:
- src: elgg-nginx.conf
- dest: "{{ nginx_conf_dir }}/elgg-nginx.conf" # /etc/nginx/conf.d
- when: elgg_enabled | bool
-
-- name: Install {{ nginx_conf_dir }}/lokole-nginx.conf from template, if lokole_enabled
- template:
- src: lokole-nginx.conf.j2
- dest: "{{ nginx_conf_dir }}/lokole-nginx.conf" # /etc/nginx/conf.d
- when: lokole_enabled | bool
-
-- name: Install {{ nginx_conf_dir }}/moodle-nginx.conf from template, if moodle_enabled
- template:
- src: moodle-nginx.conf.j2
- dest: "{{ nginx_conf_dir }}/moodle-nginx.conf" # /etc/nginx/conf.d
- when: moodle_enabled | bool
-
-- name: Install {{ nginx_conf_dir }}/nextcloud-nginx.conf from template, if nextcloud_enabled
- template:
- src: nextcloud-nginx.conf
- dest: "{{ nginx_conf_dir }}/nextcloud-nginx.conf" # /etc/nginx/conf.d
- when: nextcloud_enabled | bool
-
-- name: Install {{ nginx_conf_dir }}/nodered-nginx.conf from template, if nodered_enabled
- template:
- src: nodered-nginx.conf.j2
- dest: "{{ nginx_conf_dir }}/nodered-nginx.conf" # /etc/nginx/conf.d
- # mode: '0666'
- when: nodered_enabled | bool
-
-# mediawiki and wordpress are no longer proxied
-
-#- name: Install MediaWiki's nginx conf.d file from template
-# template:
-# src: mediawiki-nginx.conf.j2
-# dest: /etc/nginx/conf.d/mediawiki-nginx.conf
-# when: mediawiki_enabled
-
-#- name: Install WordPress's nginx conf.d file from template
-# template:
-# src: wordpress-nginx.conf
-# dest: /etc/nginx/conf.d/
-# when: wordpress_enabled
-
-#- name: Install proxpass to apache running on localhost
diff --git a/roles/nginx/templates/dokuwiki-nginx.conf.deprecated b/roles/nginx/templates/dokuwiki-nginx.conf.deprecated
deleted file mode 100644
index 9bbfe2cf7..000000000
--- a/roles/nginx/templates/dokuwiki-nginx.conf.deprecated
+++ /dev/null
@@ -1,3 +0,0 @@
-location {{ dokuwiki_url }} {
- proxy_pass http://127.0.0.1:{{ apache_port }}{{ dokuwiki_url }};
-}
diff --git a/roles/nginx/templates/mediawiki-nginx.conf.j2.deprecated b/roles/nginx/templates/mediawiki-nginx.conf.j2.deprecated
deleted file mode 100644
index b49220657..000000000
--- a/roles/nginx/templates/mediawiki-nginx.conf.j2.deprecated
+++ /dev/null
@@ -1,11 +0,0 @@
-location /mediawiki {
- proxy_pass http://127.0.0.1:{{ apache_port }}/mediawiki;
-}
- location ~ /mediawiki/.*\.php$ {
-
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header Host $host;
- proxy_pass http://127.0.0.1:{{ apache_port }};
-
-}
diff --git a/roles/nginx/templates/wordpress-nginx.conf.deprecated b/roles/nginx/templates/wordpress-nginx.conf.deprecated
deleted file mode 100644
index 345887ad9..000000000
--- a/roles/nginx/templates/wordpress-nginx.conf.deprecated
+++ /dev/null
@@ -1,11 +0,0 @@
-location /wordpress {
- proxy_pass http://127.0.0.1:{{ apache_port }}/wordpress;
-}
- location ~ /wordpress/.*\.php$ {
-
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header Host $host;
- proxy_pass http://127.0.0.1:{{ apache_port }};
-
-}
diff --git a/roles/openvpn/templates/iiab-handle.j2.deprecated b/roles/openvpn/templates/iiab-handle.j2.deprecated
deleted file mode 100755
index 157d653e5..000000000
--- a/roles/openvpn/templates/iiab-handle.j2.deprecated
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-echo -e "\n\n\e[41m DEPRECATED PLEASE RUN 'iiab-support' INSTEAD \e[0m\n\n"
-
-echo -e 'This older script TEMPORARILY (over)writes /etc/iiab/openvpn_handle to'
-echo -e 'identify IIAB to the upstream OpenVPN server, until Ansible next runs.\n'
-
-#echo -e 'CORRECT METHOD: CHANGE VARIABLE openvpn_handle IN /etc/iiab/local_vars.yml'
-#echo -e 'THEN RUN "cd /opt/iiab/iiab" THEN "./runrole openvpn"\n'
-
-echo -e 'PLEASE NOW TYPE CTRL-C TO QUIT. Or, if you really want it temporary until the'
-read -p 'next time Ansible is run, what OpenVPN handle do you want? ' ans
-echo
-
-if [ "$ans" != "" ]; then
- echo $ans > /etc/iiab/openvpn_handle
- echo -e "\nYour machine's openvpn_handle is TEMPORARILY now set... \n"
-else
- echo -e "\nWARNING: your machine's openvpn_handle remains unchanged...\n"
-fi
-
-echo -e "Restarting OpenVPN daemon...\n"
-
-# 2019-05-09: removing /etc/iiab/openvpn_handle (or setting it to "") are both very bad practices
-#if [ "$ans" == "" ]; then
-# if [ -f /etc/iiab/openvpn_handle ]; then
-# rm -f /etc/iiab/openvpn_handle
-# fi
-#else
-# echo $ans > /etc/iiab/openvpn_handle
-#fi
-
-{{ systemctl_program }} restart openvpn@xscenet
-# This would also work: (but would bounce all VPN connections, if others exist, causing unnec disruption if so)
-#{{ systemctl_program }} restart openvpn
diff --git a/roles/openvpn/templates/start.j2.deprecated b/roles/openvpn/templates/start.j2.deprecated
deleted file mode 100644
index 400c1feb5..000000000
--- a/roles/openvpn/templates/start.j2.deprecated
+++ /dev/null
@@ -1,27 +0,0 @@
-$!/bin/bash
-$ start the openvpn tunnel if the service is enabled
-
-enabled={{ openvpn_enabled }}
-VPNIP={{ openvpn_server_port }}
-
-if [ "$enabled" = 'True' ]; then
- # make sure the wan is functioning
- # 8.8.8.8 is one of google's dns servers
- ping -c 3 -i 3 8.8.8.8
- if [ $? -ne 0 ]; then
- #echo "internet is not available, tunnel not possible"
- exit 1
- fi
-
- # check the vpn tunnel
- ping -c 5 -i 5 "$VPNIP"
- # a zero return means the tunnel is up
- if [ $? -eq 0 ]; then
- exit 0
- else
- killall openvpn
- sleep 10
- #echo "Starting openvpn and waiting 10 seconds for daemon to become ready"
- systemctl start openvpn@xscenet
- fi
-fi
diff --git a/roles/openvpn/templates/up_wan.deprecated b/roles/openvpn/templates/up_wan.deprecated
deleted file mode 100755
index dec5a2080..000000000
--- a/roles/openvpn/templates/up_wan.deprecated
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# Not used as of August 2018: parent service "openvpn" reliably auto-starts child service "openpn@xscenet" on OS's in common use
-# But could be revived for older CentOS etc?
-
-# If the wan has recently come up, see if we need to start openvpn
-
-systemctl is-enabled openvpn
-if [ $? -eq 0 ]; then
- pgrep openvpn
- if [ $? -ne 0 ]; then
- systemctl start openvpn@xscenet
- fi
-fi
diff --git a/roles/sugarizer/templates/sugarizer.ini.j2.deprecated b/roles/sugarizer/templates/sugarizer.ini.j2.deprecated
deleted file mode 100644
index bbb48a914..000000000
--- a/roles/sugarizer/templates/sugarizer.ini.j2.deprecated
+++ /dev/null
@@ -1,40 +0,0 @@
-[information]
-name = Sugarizer Server
-description = Your Sugarizer Server
-
-[web]
-port = {{ sugarizer_port }}
-
-[security]
-min_password_size = 4
-max_age = 172800000
-https = false
-certificate_file = ../server.crt
-key_file = ../server.key
-strict_ssl = false
-
-[client]
-path = ../sugarizer/
-
-[database]
-server = localhost
-port = 27018
-name = sugarizer
-waitdb = 1
-
-[presence]
-port = 8039
-
-[statistics]
-active = true
-
-[collections]
-users = users
-journal = journal
-stats = stats
-
-[activities]
-activities_directory_name = activities
-template_directory_name = ActivityTemplate
-activity_info_path = activity/activity.info
-favorites = org.sugarlabs.GearsActivity,org.sugarlabs.MazeWebActivity,org.olpcfrance.PaintActivity,org.olpcfrance.TamTamMicro,org.olpcfrance.MemorizeActivity,org.olpg-france.physicsjs,org.sugarlabs.CalculateActivity,org.sugarlabs.TurtleBlocksJS,org.sugarlabs.Clock,org.sugarlabs.SpeakActivity,org.sugarlabs.moon,org.olpcfrance.RecordActivity,org.olpcfrance.Abecedarium,org.olpcfrance.videoviewer,org.olpcfrance.FoodChain,org.olpc-france.labyrinthjs,org.olpcfrance.TankOp,org.sugarlabs.ChatPrototype,org.olpcfrance.Gridpaint,org.olpc-france.LOLActivity,org.olpcfrance.sharednotes,org.sugarlabs.ColorMyWorldActivity,com.homegrownapps.xoeditor,com.homegrownapps.reflection,com.homegrownapps.abacus,org.sugarlabs.Blockrain,org.sugarlabs.StopwatchActivity,com.homegrownapps.flip,org.somosazucar.JappyActivity,org.olpcfrance.qrcode,org.sugarlabs.Markdown,org.sugarlabs.gameOfLife,org.sugarlabs.Scratch,org.sugarlabs.FotoToonJs
diff --git a/roles/sugarizer/templates/sugarizer.js.deprecated b/roles/sugarizer/templates/sugarizer.js.deprecated
deleted file mode 100644
index 1fe914071..000000000
--- a/roles/sugarizer/templates/sugarizer.js.deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-// require files
-var express = require('express'),
- http = require('http'),
- https = require('https'),
- settings = require('./config/settings'),
- common = require('./dashboard/helper/common');
- ini = settings.load(),
- app = express(),
- server = null;
-
-// init common
-common.init(ini);
-
-//configure app setting
-require('./config/main')(app, ini);
-
-// include api routes
-require('./api/route')(app, ini);
-
-// include dashboard routes
-require('./dashboard/route')(app, ini);
-
-// Handle https
-if (ini.security.https) {
- var credentials = common.loadCredentials(ini);
- if (!credentials) {
- console.log("Error reading HTTPS credentials");
- process.exit(-1);
- }
- server = https.createServer(credentials, app);
-} else {
- server = http.createServer(app);
-}
-
-var pathPrefix = '/sugarizer';
-app.use(pathPrefix, require('path-prefix-proxy')(pathPrefix));
-
-// Start listening
-server.listen(ini.web.port,"0.0.0.0");
-console.log("Sugarizer Server is listening on"+(ini.security.https ? " secure":"")+" port " + ini.web.port + "...");
-
-//export app for testing
-module.exports = app;