mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
commit
4454315345
6 changed files with 12 additions and 13 deletions
|
@ -30,13 +30,13 @@
|
||||||
- name: SUGAR-STATS
|
- name: SUGAR-STATS
|
||||||
include_role:
|
include_role:
|
||||||
name: sugar-stats
|
name: sugar-stats
|
||||||
when: sugar_stats_install and ansible_distribution != "CentOS"
|
when: sugar_stats_install is defined and sugar_stats_install and ansible_distribution != "CentOS"
|
||||||
tags: olpc, sugar-stats
|
tags: olpc, sugar-stats
|
||||||
|
|
||||||
- name: TEAMVIEWER
|
- name: TEAMVIEWER
|
||||||
include_role:
|
include_role:
|
||||||
name: teamviewer
|
name: teamviewer
|
||||||
when: teamviewer_install
|
when: teamviewer_install is defined and teamviewer_install
|
||||||
tags: teamviewer
|
tags: teamviewer
|
||||||
|
|
||||||
- name: VNSTAT
|
- name: VNSTAT
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
- name: XOVIS
|
- name: XOVIS
|
||||||
include_role:
|
include_role:
|
||||||
name: xovis
|
name: xovis
|
||||||
when: xovis_install and ansible_distribution != "CentOS"
|
when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS"
|
||||||
tags: xovis
|
tags: xovis
|
||||||
|
|
||||||
- name: Recording STAGE 8 HAS COMPLETED ======================
|
- name: Recording STAGE 8 HAS COMPLETED ======================
|
||||||
|
|
|
@ -102,7 +102,7 @@
|
||||||
|
|
||||||
- name: Create symlinks for enabling our site (debuntu)
|
- name: Create symlinks for enabling our site (debuntu)
|
||||||
file:
|
file:
|
||||||
path: "/etc/apache2/sites-enabled/{{ item }}" # Not nec on Raspbian. Is this really still needed elsewhere?
|
path: "/etc/apache2/sites-enabled/{{ item }}"
|
||||||
src: "/etc/apache2/sites-available/{{ item }}"
|
src: "/etc/apache2/sites-available/{{ item }}"
|
||||||
state: link
|
state: link
|
||||||
with_items:
|
with_items:
|
||||||
|
@ -114,7 +114,7 @@
|
||||||
path: "{{ item }}"
|
path: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items:
|
with_items:
|
||||||
- /etc/apache2/000-default.conf
|
- /etc/apache2/000-default.conf # Not nec on Raspbian. Is this really still needed elsewhere?
|
||||||
- /etc/apache2/sites-enabled/000-default.conf
|
- /etc/apache2/sites-enabled/000-default.conf
|
||||||
when: is_debuntu
|
when: is_debuntu
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
# set_fact:
|
# set_fact:
|
||||||
# py_captive_portal_install: True
|
# py_captive_portal_install: True
|
||||||
|
|
||||||
- name: (Re)Installing captive portal
|
- name: (Re)Installing Captive Portal
|
||||||
include_tasks: captive_portal.yml
|
include_tasks: captive_portal.yml
|
||||||
when: py_captive_portal_install
|
when: py_captive_portal_install
|
||||||
|
|
||||||
|
|
|
@ -4,15 +4,14 @@
|
||||||
HANDLE=
|
HANDLE=
|
||||||
UUID=
|
UUID=
|
||||||
if [ -f /etc/iiab/openvpn_handle ]; then
|
if [ -f /etc/iiab/openvpn_handle ]; then
|
||||||
# Option #0: Source directly from /etc/iiab/local_vars.yml in future?
|
# Option #1: Source directly from /etc/iiab/local_vars.yml in future?
|
||||||
# Option #1
|
# Option #2
|
||||||
HANDLE=`cat /etc/iiab/openvpn_handle`
|
HANDLE=`cat /etc/iiab/openvpn_handle`
|
||||||
# Option #2: UUID is later used, if openvpn_handle is not set
|
|
||||||
|
|
||||||
# Sourcing a variable from ~4 different places is a recipe for total confusion
|
# Sourcing a variable from ~4 different places is a recipe for total confusion
|
||||||
# (or worse!) Far better to make variable openvpn_handle and file
|
# (or worse!) Far better to make variable openvpn_handle and file
|
||||||
# /etc/iiab/openvpn_handle "obligatory" (EMPTY STRING "" IS TOLERATED, in which
|
# /etc/iiab/openvpn_handle "obligatory" (EMPTY STRING "" IS TOLERATED, IN WHICH
|
||||||
# case OpenVPN server should use /etc/iiab/uuid in lieu of the handle).
|
# CASE OPENVPN SERVER TRIES TO USE /etc/iiab/uuid BELOW, IN LIEU OF HANDLE...)
|
||||||
|
|
||||||
# CLARIF: "systemctl restart openvpn@xscenet" still runs even if the above is
|
# CLARIF: "systemctl restart openvpn@xscenet" still runs even if the above is
|
||||||
# defied. e.g. if an implementer deletes /etc/iiab/openvpn_handle by accident.
|
# defied. e.g. if an implementer deletes /etc/iiab/openvpn_handle by accident.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
phpmyadmin_install: False
|
phpmyadmin_install: False
|
||||||
phpmyadmin_enabled: False
|
phpmyadmin_enabled: False
|
||||||
phpmyadmin_name: "phpMyAdmin-4.8.2-all-languages"
|
phpmyadmin_name: "phpMyAdmin-4.8.3-all-languages"
|
||||||
phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"
|
phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue