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 pull request #324 from iiab/master

Browse source 
sync from iiab:master
This commit is contained in:
A Holt 2020-01-04 14:51:28 -05:00 • committed by GitHub
commit d009db5845
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
- name: Install Gitea {{ gitea_version }} if gitea_install - name: Install Gitea {{ gitea_version }} if gitea_install
include_tasks: install.yml include_tasks: install.yml
when: gitea_install | bool and not gitea_installed is defined when: gitea_install and not (gitea_installed is defined)
- name: Enable Gitea {{ gitea_version }} if gitea_install - name: Enable Gitea {{ gitea_version }} if gitea_install
include_tasks: enable.yml include_tasks: enable.yml
when: gitea_install | bool or gitea_installed is defined when: gitea_install or gitea_installed is defined

2
roles/gitea/templates/gitea-nginx.conf.j2
View file

@ -1,3 +1,3 @@
location {{ gitea_url }}/ { location {{ gitea_url }}/ {
proxy_pass http://127.0.0.1:{{ gitea_port }}; proxy_pass http://127.0.0.1:{{ gitea_port }}/;
} }

0
roles/nginx/files/README.md → roles/nginx/README.md
View file

6
vars/default_vars.yml
View file

@ -73,8 +73,9 @@ iiab_domain: lan
lan_ip: 172.18.96.1 lan_ip: 172.18.96.1
lan_netmask: 255.255.224.0 lan_netmask: 255.255.224.0
# Homepage: set to /home or /wordpress or /mediawiki or /wiki (for DokuWiki) # Homepage: set to /home or /wordpress or /wiki (for MediaWiki)
iiab_home_url: /home iiab_home_url: /home
# You might also want to set captiveportal_splash_page (below!)
# Internal Wi-Fi Access Point # Internal Wi-Fi Access Point
# Values are used if there is an internal Wi-Fi adapter and hostapd is enabled # Values are used if there is an internal Wi-Fi adapter and hostapd is enabled
@ -143,11 +144,12 @@ dns_jail_enabled: False
# Python-based Captive Portal, that @m-anish & @jvonau experimented with in # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
# July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
# extensively refined later in 2018 (PRs #1179, #1300, #1327). # extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070).
captiveportal_install: False captiveportal_install: False
captiveportal_enabled: False captiveportal_enabled: False
captiveportal_port: 9090 captiveportal_port: 9090
captiveportal_splash_page: / captiveportal_splash_page: /
# You might also want to set iiab_home_url (above!)
# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
# Bluetooth PAN access to IIAB server # Bluetooth PAN access to IIAB server

6
vars/local_vars_big.yml
View file

@ -29,8 +29,9 @@ iiab_admin_pwd_hash: $6$xsce51$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGm
iiab_hostname: box iiab_hostname: box
iiab_domain: lan iiab_domain: lan
# Homepage: set to /home or /wordpress or /mediawiki or /wiki (for DokuWiki) # Homepage: set to /home or /wordpress or /wiki (for MediaWiki)
iiab_home_url: /home iiab_home_url: /home
# You might also want to set captiveportal_splash_page (below!)
# Raspbian requires WiFi country since March 2018. Please set it here: # Raspbian requires WiFi country since March 2018. Please set it here:
host_country_code: US host_country_code: US
@ -81,10 +82,11 @@ dns_jail_enabled: False
# Python-based Captive Portal, that @m-anish & @jvonau experimented with in # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
# July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
# extensively refined later in 2018 (PRs #1179, #1300, #1327). # extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070).
captiveportal_install: False captiveportal_install: False
captiveportal_enabled: False captiveportal_enabled: False
captiveportal_splash_page: / captiveportal_splash_page: /
# You might also want to set iiab_home_url (above!)
# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
# Bluetooth PAN access to IIAB server # Bluetooth PAN access to IIAB server

6
vars/local_vars_medium.yml
View file

@ -29,8 +29,9 @@ iiab_admin_pwd_hash: $6$xsce51$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGm
iiab_hostname: box iiab_hostname: box
iiab_domain: lan iiab_domain: lan
# Homepage: set to /home or /wordpress or /mediawiki or /wiki (for DokuWiki) # Homepage: set to /home or /wordpress or /wiki (for MediaWiki)
iiab_home_url: /home iiab_home_url: /home
# You might also want to set captiveportal_splash_page (below!)
# Raspbian requires WiFi country since March 2018. Please set it here: # Raspbian requires WiFi country since March 2018. Please set it here:
host_country_code: US host_country_code: US
@ -81,10 +82,11 @@ dns_jail_enabled: False
# Python-based Captive Portal, that @m-anish & @jvonau experimented with in # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
# July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
# extensively refined later in 2018 (PRs #1179, #1300, #1327). # extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070).
captiveportal_install: False captiveportal_install: False
captiveportal_enabled: False captiveportal_enabled: False
captiveportal_splash_page: / captiveportal_splash_page: /
# You might also want to set iiab_home_url (above!)
# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
# Bluetooth PAN access to IIAB server # Bluetooth PAN access to IIAB server

6
vars/local_vars_min.yml
View file

@ -29,8 +29,9 @@ iiab_admin_pwd_hash: $6$xsce51$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGm
iiab_hostname: box iiab_hostname: box
iiab_domain: lan iiab_domain: lan
# Homepage: set to /home or /wordpress or /mediawiki or /wiki (for DokuWiki) # Homepage: set to /home or /wordpress or /wiki (for MediaWiki)
iiab_home_url: /home iiab_home_url: /home
# You might also want to set captiveportal_splash_page (below!)
# Raspbian requires Wi-Fi country since March 2018. Please set it here: # Raspbian requires Wi-Fi country since March 2018. Please set it here:
host_country_code: US host_country_code: US
@ -81,10 +82,11 @@ dns_jail_enabled: False
# Python-based Captive Portal, that @m-anish & @jvonau experimented with in # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
# July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
# extensively refined later in 2018 (PRs #1179, #1300, #1327). # extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070).
captiveportal_install: False captiveportal_install: False
captiveportal_enabled: False captiveportal_enabled: False
captiveportal_splash_page: / captiveportal_splash_page: /
# You might also want to set iiab_home_url (above!)
# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
# Bluetooth PAN access to IIAB server # Bluetooth PAN access to IIAB server