From d6245356fad72dd4ed17286589ea3e7b6b6203f3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 16 Oct 2018 16:55:44 -0400 Subject: [PATCH 1/5] Delete README.md.deprecated --- README.md.deprecated | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 README.md.deprecated diff --git a/README.md.deprecated b/README.md.deprecated deleted file mode 100644 index f1da871b1..000000000 --- a/README.md.deprecated +++ /dev/null @@ -1,41 +0,0 @@ -====================================== -School Server Community Edition (XSCE) -====================================== - -Welcome to the Git repository of the XSCE project. XSCE is a community-based -project developed and supported by volunteers from around the world. It -provides communication, networking, content, and maintenance to schools and -classrooms. In everyday usage the school server provides services which extend -capabilities of the connected laptops while being transparent to the -user. These services include: - -* Classroom connectivity – Similar to what you would find in an advanced home router. -* Internet gateway – If available, an internet connection is made available to laptops. -* Content – Tools to make instructional media available to their schools and classrooms. -* Maintenance – Tools to keep laptop updated and running smoothly. - -All of our server code resides in this repository. We are using ansible_ as the -underlying technology to install, deploy, configure and manage the various -server components. - -Documentation has recently moved to the wiki of this repo - -Please see the `XSCE wiki`_ - -Installation procedures are in the process of being reworked to include: - -* Offline install on bare metal from a usb stick -* Offline install with an iso file -* Manual install of all or part of the server in combination with either of the above - -Full installation instructions are in the wiki of this repo: - -Please read the `installation`_ documentation. - -See the `XSCE project`_ for more information about the project. - -.. _XSCE wiki: https://github.com/XSCE/xsce/wiki -.. _installation: https://github.com/XSCE/xsce/wiki/XSCE-Installation -.. _ansible: http://www.ansibleworks.com/ -.. _ansible documentation: http://www.ansibleworks.com/docs/ -.. _XSCE project: http://schoolserver.org/ From 961d7a2522611cd2752c0ef0ca12c96e6f0f1b2c Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 16 Oct 2018 16:55:55 -0400 Subject: [PATCH 2/5] Delete ansible.cfg.deprecated --- ansible.cfg.deprecated | 194 ----------------------------------------- 1 file changed, 194 deletions(-) delete mode 100644 ansible.cfg.deprecated diff --git a/ansible.cfg.deprecated b/ansible.cfg.deprecated deleted file mode 100644 index 3e0caabbd..000000000 --- a/ansible.cfg.deprecated +++ /dev/null @@ -1,194 +0,0 @@ -# config file for ansible -- http://ansible.com/ -# ============================================== - -# nearly all parameters can be overridden in ansible-playbook -# or with command line flags. ansible will read ANSIBLE_CONFIG, -# ansible.cfg in the current working directory, .ansible.cfg in -# the home directory or /etc/ansible/ansible.cfg, whichever it -# finds first - -[defaults] - -# some basic default values... - -hostfile = /etc/ansible/hosts -library = /usr/share/ansible -remote_tmp = /opt/iiab/iiab/.ansible/tmp -local_tmp = /opt/iiab/iiab/.ansible/tmp -pattern = * -forks = 5 -poll_interval = 15 -sudo_user = root -#ask_sudo_pass = True -#ask_pass = True -transport = smart -remote_port = 22 -module_lang = C - -# plays will gather facts by default, which contain information about -# the remote system. -# -# smart - gather by default, but don't regather if already gathered -# implicit - gather by default, turn off with gather_facts: False -# explicit - do not gather by default, must say gather_facts: True -gathering = implicit - -# additional paths to search for roles in, colon separated -#roles_path = /etc/ansible/roles - -# uncomment this to disable SSH key host checking -#host_key_checking = False - -# change this for alternative sudo implementations -sudo_exe = sudo - -# what flags to pass to sudo -#sudo_flags = -H - -# SSH timeout -timeout = 10 - -# default user to use for playbooks if user is not specified -# (/usr/bin/ansible will use current user as default) -#remote_user = root - -# logging is off by default unless this path is defined -# if so defined, consider logrotate -#log_path = /var/log/ansible.log - -# default module name for /usr/bin/ansible -#module_name = command - -# use this shell for commands executed under sudo -# you may need to change this to bin/bash in rare instances -# if sudo is constrained -#executable = /bin/sh - -# if inventory variables overlap, does the higher precedence one win -# or are hash values merged together? The default is 'replace' but -# this can also be set to 'merge'. -#hash_behaviour = replace - -# list any Jinja2 extensions to enable here: -#jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n - -# if set, always use this private key file for authentication, same as -# if passing --private-key to ansible or ansible-playbook -#private_key_file = /path/to/file - -# format of string {{ ansible_managed }} available within Jinja2 -# templates indicates to users editing templates files will be replaced. -# replacing {file}, {host} and {uid} and strftime codes with proper values. -ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host} - -# by default, ansible-playbook will display "Skipping [host]" if it determines a task -# should not be run on a host. Set this to "False" if you don't want to see these "Skipping" -# messages. NOTE: the task header will still be shown regardless of whether or not the -# task is skipped. -#display_skipped_hosts = True - -# by default (as of 1.3), Ansible will raise errors when attempting to dereference -# Jinja2 variables that are not set in templates or action lines. Uncomment this line -# to revert the behavior to pre-1.3. -#error_on_undefined_vars = False - -# by default (as of 1.6), Ansible may display warnings based on the configuration of the -# system running ansible itself. This may include warnings about 3rd party packages or -# other conditions that should be resolved if possible. -# to disable these warnings, set the following value to False: -system_warnings = False - -# by default (as of 1.4), Ansible may display deprecation warnings for language -# features that should no longer be used and will be removed in future versions. -# to disable these warnings, set the following value to False: -deprecation_warnings = False - -# set plugin path directories here, separate with colons -action_plugins = /usr/share/ansible_plugins/action_plugins -callback_plugins = /usr/share/ansible_plugins/callback_plugins -connection_plugins = /usr/share/ansible_plugins/connection_plugins -lookup_plugins = /usr/share/ansible_plugins/lookup_plugins -vars_plugins = /usr/share/ansible_plugins/vars_plugins -filter_plugins = /usr/share/ansible_plugins/filter_plugins - -# don't like cows? that's unfortunate. -# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1 -#nocows = 1 - -# don't like colors either? -# set to 1 if you don't want colors, or export ANSIBLE_NOCOLOR=1 -#nocolor = 1 - -# the CA certificate path used for validating SSL certs. This path -# should exist on the controlling node, not the target nodes -# common locations: -# RHEL/CentOS: /etc/pki/tls/certs/ca-bundle.crt -# Fedora : /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem -# Ubuntu : /usr/share/ca-certificates/cacert.org/cacert.org.crt -#ca_file_path = - -# the http user-agent string to use when fetching urls. Some web server -# operators block the default urllib user agent as it is frequently used -# by malicious attacks/scripts, so we set it to something unique to -# avoid issues. -#http_user_agent = ansible-agent - -[paramiko_connection] - -# uncomment this line to cause the paramiko connection plugin to not record new host -# keys encountered. Increases performance on new host additions. Setting works independently of the -# host key checking setting above. -#record_host_keys=False - -# by default, Ansible requests a pseudo-terminal for commands executed under sudo. Uncomment this -# line to disable this behaviour. -#pty=False - -[ssh_connection] - -# ssh arguments to use -# Leaving off ControlPersist will result in poor performance, so use -# paramiko on older platforms rather than removing it -#ssh_args = -o ControlMaster=auto -o ControlPersist=60s - -# The path to use for the ControlPath sockets. This defaults to -# "%(directory)s/ansible-ssh-%%h-%%p-%%r", however on some systems with -# very long hostnames or very long path names (caused by long user names or -# deeply nested home directories) this can exceed the character limit on -# file socket names (108 characters for most platforms). In that case, you -# may wish to shorten the string below. -# -# Example: -# control_path = %(directory)s/%%h-%%r -#control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r - -# Enabling pipelining reduces the number of SSH operations required to -# execute a module on the remote server. This can result in a significant -# performance improvement when enabled, however when using "sudo:" you must -# first disable 'requiretty' in /etc/sudoers -# -# By default, this option is disabled to preserve compatibility with -# sudoers configurations that have requiretty (the default on many distros). -# -#pipelining = False - -# if True, make ansible use scp if the connection type is ssh -# (default is sftp) -#scp_if_ssh = True - -[accelerate] -accelerate_port = 5099 -accelerate_timeout = 30 -accelerate_connect_timeout = 5.0 - -# The daemon timeout is measured in minutes. This time is measured -# from the last activity to the accelerate daemon. -accelerate_daemon_timeout = 30 - -# If set to yes, accelerate_multi_key will allow multiple -# private keys to be uploaded to it, though each user must -# have access to the system via SSH to add a new key. The default -# is "no". -#accelerate_multi_key = yes - -command_warnings = False From 899814a4b419cedcbd834102ee52a86d06feb5ae Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 16 Oct 2018 16:56:02 -0400 Subject: [PATCH 3/5] Delete iiab.yml.deprecated --- iiab.yml.deprecated | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 iiab.yml.deprecated diff --git a/iiab.yml.deprecated b/iiab.yml.deprecated deleted file mode 100644 index d387a1d7c..000000000 --- a/iiab.yml.deprecated +++ /dev/null @@ -1,22 +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 - - /etc/iiab/config_vars.yml - - roles: - - { role: 0-init, tags: ['0-init'] } - - { role: 1-prep, tags: ['1-prep','platform','base'] } - - { role: 2-common, tags: ['2-common','base'] } - - { role: 3-base-server, tags: ['3-base-server','base'] } - - { role: 4-server-options, tags: ['4-server-options'] } - - { role: 5-xo-services, tags: ['5-xo-services'] } - - { role: 6-generic-apps, tags: ['6-generic-apps'] } - - { role: 7-edu-apps, tags: ['7-edu-apps'] } - - { role: 8-mgmt-tools, tags: ['8-mgmt-tools'] } - - { role: 9-local-addons, tags: ['9-local-addons'] } - - { role: network, tags: ['network'] } From 8aee808587e79955a50751ce2e4c2dbdd2938939 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 16 Oct 2018 16:56:09 -0400 Subject: [PATCH 4/5] Delete runansible.deprecated --- runansible.deprecated | 68 ------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100755 runansible.deprecated diff --git a/runansible.deprecated b/runansible.deprecated deleted file mode 100755 index ef7afb58b..000000000 --- a/runansible.deprecated +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -e - -echo "Please consider ./iiab-install instead of the lesser-supported ./runansible" - -PLAYBOOK="iiab.yml" -INVENTORY="ansible_hosts" -# Pass cmdline options for ansible -ARGS="$@" - -# if vars/local_vars.yml is missing, put a default one in place - First Run -if [ ! -f ./vars/local_vars.yml ]; then - OS=`grep ^ID= /etc/*release|cut -d= -f2` - OS=${OS//\"/} - - case $OS in - OLPC | fedora) - cp ./vars/local_vars_olpc.yml ./vars/local_vars.yml - ;; - centos | debian | ubuntu | raspbian) - cp ./vars/local_vars_medium.yml ./vars/local_vars.yml - ;; - *) - echo "IIAB supports raspbian, debian, ubuntu, centos, and OLPC - exiting now..." - exit 1 - ;; - esac -fi - -# copy var files to /etc/iiab for subsequent use -# If iiab.env exists, on second or upgrade run, check for stale variables -# iiab.env gets created at the end of stage-4 on First Run -if [ -f /etc/iiab/iiab.env ] -then - OLD=`grep XSCE /etc/iiab/iiab.env | wc -l` - if [ "$OLD" -gt 0 ] - then - rm /etc/iiab/iiab.env - else - . /etc/iiab/iiab.env - cd $IIAB_DIR - fi -else - mkdir -p /etc/iiab - echo "{}" > /etc/iiab/config_vars.yml -fi - -CWD=`pwd` - -if [ ! -f $PLAYBOOK ] -then - echo "IIAB Playbook not found." - echo "Please run this command from the top level of the git repo." - echo "Exiting." - exit 1 -fi - -if [ ! -f /etc/ansible/facts.d/local_facts.fact ]; then - mkdir -p /etc/ansible/facts.d -fi -cp ./scripts/local_facts.fact /etc/ansible/facts.d/local_facts.fact - -echo "Running local playbooks! " - - -export ANSIBLE_LOG_PATH="$CWD/iiab-install.log" -ansible -m setup -i $INVENTORY localhost --connection=local >> /dev/null - -ansible-playbook -i $INVENTORY $PLAYBOOK ${ARGS} --connection=local From f9cdee2d9248d8e773b9b12caa53da04e159601a Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 16 Oct 2018 16:56:19 -0400 Subject: [PATCH 5/5] Delete runtags.deprecated --- runtags.deprecated | 47 ---------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100755 runtags.deprecated diff --git a/runtags.deprecated b/runtags.deprecated deleted file mode 100755 index 2c6e3f7c4..000000000 --- a/runtags.deprecated +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -INVENTORY="ansible_hosts" -PLAYBOOK="iiab.yml" -#PLAYBOOK="iiab-stages.yml" -CWD=`pwd` - -export ANSIBLE_LOG_PATH="$CWD/iiab-debug.log" - -if [ ! -f $PLAYBOOK ]; then - echo "Exiting: IIAB Playbook not found." - echo "Please run this in /opt/iiab/iiab (top level of the git repo)." - exit 1 -fi - -# Is the following stanza nec? -if [ ! -f /etc/iiab/config_vars.yml ]; then - mkdir -p /etc/iiab - echo "{}" > /etc/iiab/config_vars.yml -fi - -tags=$(echo $1 | tr "," "\n") - -if [ "$tags" == "" ]; then - echo " usage: ./runtags " - echo " usage: ./runtags ,," - echo " Can take a single value or a comma-separated list (no spaces within the list!)" - echo " Now retrieving a list of possible Ansible playbook and tagname values..." - ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local --list-tags - exit 0 -fi - -found="N" - -for tag in $tags; do - if [ "$tag" == "0-init" ]; then - found="Y" - fi -done - -taglist=$1 - -if [ "$found" == "N" ]; then - taglist="0-init,"$taglist -fi - -ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local --tags=$taglist