1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Merge pull request #257 from iiab/master

sync from iiab/iiab
This commit is contained in:
A Holt 2019-06-19 20:06:26 -04:00 committed by GitHub
commit f46d772c62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions

View file

@ -33,7 +33,7 @@
with_items: with_items:
- { src: 'iiab-bt-pan-on.j2', dest: '/usr/bin/iiab-bt-pan-on' } - { src: 'iiab-bt-pan-on.j2', dest: '/usr/bin/iiab-bt-pan-on' }
- { src: 'iiab-bt-pan-off.j2', dest: '/usr/bin/iiab-bt-pan-off' } - { src: 'iiab-bt-pan-off.j2', dest: '/usr/bin/iiab-bt-pan-off' }
- { src: 'iiab-bt-pan-discoverable-on.j2', dest: 'iiab-bt-pan-discoverable-on' } - { src: 'iiab-bt-pan-discoverable-on.j2', dest: '/usr/bin/iiab-bt-pan-discoverable-on' }
- { src: 'iiab-bt-term-on.j2', dest: '/usr/bin/iiab-bt-term-on' } - { src: 'iiab-bt-term-on.j2', dest: '/usr/bin/iiab-bt-term-on' }
- { src: 'iiab-bt-term-off.j2', dest: '/usr/bin/iiab-bt-term-off' } - { src: 'iiab-bt-term-off.j2', dest: '/usr/bin/iiab-bt-term-off' }

View file

@ -8,7 +8,7 @@
# https://git.coolaj86.com/coolaj86/gitea-installer.sh # https://git.coolaj86.com/coolaj86/gitea-installer.sh
# Information needed to install Gitea # Information needed to install Gitea
gitea_version: 1.8.2 gitea_version: 1.8.3
iset_suffixes: iset_suffixes:
i386: 386 i386: 386
x86_64: amd64 x86_64: amd64

View file

@ -5,7 +5,7 @@
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
mediawiki_major_version: "1.32" mediawiki_major_version: "1.32"
mediawiki_minor_version: "1" mediawiki_minor_version: "2"
mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}" mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}"
mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}" mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}"

View file

@ -45,8 +45,8 @@
set_fact: set_fact:
named_enabled: False named_enabled: False
dhcpd_enabled: False dhcpd_enabled: False
dnsmasq_enabled: False dnsmasq_enabled: True
dhcp_service2: "dnsmasq disabled" dhcp_service2: "dnsmasq"
when: dnsmasq_install and iiab_network_mode == "Appliance" when: dnsmasq_install and iiab_network_mode == "Appliance"
- name: Add 'network' variable values (from computed_services.yml) to {{ iiab_ini_file }} - name: Add 'network' variable values (from computed_services.yml) to {{ iiab_ini_file }}

View file

@ -61,5 +61,5 @@ static domain_name_servers=127.0.0.1
interface {{ iiab_wan_iface }} interface {{ iiab_wan_iface }}
static ip_address={{ wan_ip }}/24 static ip_address={{ wan_ip }}/24
static routers={{ wan_gateway }} static routers={{ wan_gateway }}
domain_name_servers= {{ wan_nameserver }} static domain_name_servers={{ wan_nameserver }}
{% endif %} {% endif %}