external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/iiab/iiab

Browse source
This commit is contained in:
root 2018-08-21 14:57:56 -04:00
commit e7b9d77ad6
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/httpd/tasks/main.yml
View file

@ -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

9
roles/openvpn/templates/announcer.j2
View file

@ -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.