mirror of
				https://github.com/iiab/iiab.git
				synced 2025-03-09 15:40:17 +00:00 
			
		
		
		
	dispersed changes
This commit is contained in:
		
							parent
							
								
									a3f7be39b7
								
							
						
					
					
						commit
						fc6c05540c
					
				
					 7 changed files with 21 additions and 11 deletions
				
			
		| 
						 | 
					@ -33,7 +33,7 @@
 | 
				
			||||||
    state: present
 | 
					    state: present
 | 
				
			||||||
  when: is_debuntu | bool
 | 
					  when: is_debuntu | bool
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: "Install 23 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sudo, tar, unzip, usbmount, usbutils, wget"
 | 
					- name: "Install 24 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3,sudo, tar, unzip, usbmount, usbutils, wget"
 | 
				
			||||||
  package:
 | 
					  package:
 | 
				
			||||||
    name:
 | 
					    name:
 | 
				
			||||||
      - acpid
 | 
					      - acpid
 | 
				
			||||||
| 
						 | 
					@ -56,6 +56,7 @@
 | 
				
			||||||
      - pandoc
 | 
					      - pandoc
 | 
				
			||||||
      - pastebinit
 | 
					      - pastebinit
 | 
				
			||||||
      - rsync
 | 
					      - rsync
 | 
				
			||||||
 | 
					      - sqlite3
 | 
				
			||||||
      - sudo
 | 
					      - sudo
 | 
				
			||||||
      - tar
 | 
					      - tar
 | 
				
			||||||
      - unzip
 | 
					      - unzip
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,6 +16,14 @@
 | 
				
			||||||
    state: present
 | 
					    state: present
 | 
				
			||||||
  when: not (iiab_lan_iface == "none") and not installing
 | 
					  when: not (iiab_lan_iface == "none") and not installing
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- name: Remove conflicting FQDN 127.0.0.1 in /etc/hosts placed by roles/0-init/tasks/hostname..yml/ L28
 | 
				
			||||||
 | 
					  lineinfile:
 | 
				
			||||||
 | 
					    path: /etc/hosts
 | 
				
			||||||
 | 
					    regexp: '^127\.0\.0\.1'
 | 
				
			||||||
 | 
					    line: '127.0.0.1     localhost.localdomain localhost'
 | 
				
			||||||
 | 
					    state: present
 | 
				
			||||||
 | 
					  when: not (iiab_lan_iface == "none") and not installing
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# roles/0-init/tasks/hostname.yml ALSO does this:
 | 
					# roles/0-init/tasks/hostname.yml ALSO does this:
 | 
				
			||||||
- name: 'Put FQDN & hostnames in /etc/hosts: "127.0.0.1 {{ iiab_hostname }}.{{ iiab_domain }} localhost.localdomain localhost {{ iiab_hostname }} box box.lan" (if iiab_lan_iface == "none" and not installing, appliance mode?)'
 | 
					- name: 'Put FQDN & hostnames in /etc/hosts: "127.0.0.1 {{ iiab_hostname }}.{{ iiab_domain }} localhost.localdomain localhost {{ iiab_hostname }} box box.lan" (if iiab_lan_iface == "none" and not installing, appliance mode?)'
 | 
				
			||||||
  lineinfile:
 | 
					  lineinfile:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,9 +22,10 @@ http {
 | 
				
			||||||
	tcp_nodelay on;
 | 
						tcp_nodelay on;
 | 
				
			||||||
	keepalive_timeout 65;
 | 
						keepalive_timeout 65;
 | 
				
			||||||
	types_hash_max_size 2048;
 | 
						types_hash_max_size 2048;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# server_tokens off;
 | 
						# server_tokens off;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# server_names_hash_bucket_size 64;
 | 
						server_names_hash_bucket_size 64;
 | 
				
			||||||
	# server_name_in_redirect off;
 | 
						# server_name_in_redirect off;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	include /etc/nginx/mime.types;
 | 
						include /etc/nginx/mime.types;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -144,9 +144,9 @@ 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).
 | 
				
			||||||
captive_portal_install: False
 | 
					captiveportal_install: False
 | 
				
			||||||
captive_portal_enabled: False
 | 
					captiveportal_enabled: False
 | 
				
			||||||
captive_portal_port: 9090
 | 
					captiveportal_port: 9090
 | 
				
			||||||
# 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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -82,8 +82,8 @@ 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).
 | 
				
			||||||
captive_portal_install: False
 | 
					captiveportal_install: False
 | 
				
			||||||
captive_portal_enabled: False
 | 
					captiveportal_enabled: False
 | 
				
			||||||
# 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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -82,8 +82,8 @@ 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).
 | 
				
			||||||
captive_portal_install: False
 | 
					captiveportal_install: False
 | 
				
			||||||
captive_portal_enabled: False
 | 
					captiveportal_enabled: False
 | 
				
			||||||
# 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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -82,8 +82,8 @@ 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).
 | 
				
			||||||
captive_portal_install: False
 | 
					captiveportal_install: False
 | 
				
			||||||
captive_portal_enabled: False
 | 
					captiveportal_enabled: False
 | 
				
			||||||
# 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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue