From f9b29b17da1e095e3b058873249823f158e00b25 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 14:47:10 -0400 Subject: [PATCH 01/20] 500 -> {{ pi_swap_size }} --- roles/1-prep/tasks/raspberry_pi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/1-prep/tasks/raspberry_pi.yml b/roles/1-prep/tasks/raspberry_pi.yml index 22efe6934..c8b0e41f7 100644 --- a/roles/1-prep/tasks/raspberry_pi.yml +++ b/roles/1-prep/tasks/raspberry_pi.yml @@ -32,11 +32,11 @@ name: ntp state: latest -- name: Increase swap file size (to CONF_SWAPSIZE=500 in /etc/dphys-swapfile) as kalite pip download fails (debuntu) +- name: Increase swap file size (to CONF_SWAPSIZE={{ pi_swap_size }} in /etc/dphys-swapfile) as kalite pip download fails (debuntu) lineinfile: path: /etc/dphys-swapfile regexp: "^CONF_SWAPSIZE" - line: CONF_SWAPSIZE=500 + line: "CONF_SWAPSIZE={{ pi_swap_size }}" when: is_debuntu | bool - name: Restart swap service "dphys-swapfile" (debuntu) From 04152fe81fdd5c1daac14892019bbf2a05769224 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 14:54:43 -0400 Subject: [PATCH 02/20] pi_swap_size: 1024 --- vars/default_vars.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index bd11ba271..6444ec964 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -177,6 +177,10 @@ wan_nameserver: # 1-PREP +# Some prefer 512MB for Zero W, others 2048MB or higher for RPi 3 and 4. +# Please see recommendations at: https://itsfoss.com/swap-size/ +pi_swap_size: 1024 + sshd_enabled: True # roles/iiab-admin runs here From f3efd021081e5bf829f2f1784d908de466d4a448 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 14:56:39 -0400 Subject: [PATCH 03/20] pi_swap_size: 1024 --- vars/local_vars_min.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index c9e76bbe5..f2a521d77 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -90,6 +90,10 @@ js_menu_install: True # 1-PREP +# Some prefer 512MB for Zero W, others 2048MB or higher for RPi 3 and 4. +# Please see recommendations at: https://itsfoss.com/swap-size/ +pi_swap_size: 1024 + # roles/sshd & roles/iiab-admin run here # SEE IIAB-ADMIN VARIABLES NEAR TOP OF THIS FILE: # e.g. iiab_admin_user_install, iiab_admin_user, iiab_admin_pwd_hash From b5715385916e6ffeed6a34e97e79e87cbf5334dd Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 14:56:42 -0400 Subject: [PATCH 04/20] pi_swap_size: 1024 --- vars/local_vars_medium.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index c99c2ac9e..4df34ccd2 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -90,6 +90,10 @@ js_menu_install: True # 1-PREP +# Some prefer 512MB for Zero W, others 2048MB or higher for RPi 3 and 4. +# Please see recommendations at: https://itsfoss.com/swap-size/ +pi_swap_size: 1024 + # roles/sshd & roles/iiab-admin run here # SEE IIAB-ADMIN VARIABLES NEAR TOP OF THIS FILE: # e.g. iiab_admin_user_install, iiab_admin_user, iiab_admin_pwd_hash From 7c7f2e2b907c57be17fbdb3fcb9b4a767a0fd87f Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 14:56:46 -0400 Subject: [PATCH 05/20] pi_swap_size: 1024 --- vars/local_vars_big.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index bc6293501..6d30ad7e5 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -90,6 +90,10 @@ js_menu_install: True # 1-PREP +# Some prefer 512MB for Zero W, others 2048MB or higher for RPi 3 and 4. +# Please see recommendations at: https://itsfoss.com/swap-size/ +pi_swap_size: 1024 + # roles/sshd & roles/iiab-admin run here # SEE IIAB-ADMIN VARIABLES NEAR TOP OF THIS FILE: # e.g. iiab_admin_user_install, iiab_admin_user, iiab_admin_pwd_hash From 9072978698fee206ae63531f7c1a3e8eb1c16b21 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 15:01:36 -0400 Subject: [PATCH 06/20] Update default_vars.yml --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 6444ec964..8a08b490b 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -177,7 +177,7 @@ wan_nameserver: # 1-PREP -# Some prefer 512MB for Zero W, others 2048MB or higher for RPi 3 and 4. +# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ pi_swap_size: 1024 From e53a05c99f296b9ea0b19a189a2ee17ff2813539 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 15:02:20 -0400 Subject: [PATCH 07/20] Update local_vars_min.yml --- vars/local_vars_min.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index f2a521d77..622a91c27 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -90,7 +90,7 @@ js_menu_install: True # 1-PREP -# Some prefer 512MB for Zero W, others 2048MB or higher for RPi 3 and 4. +# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ pi_swap_size: 1024 From 77d0fe56faccc0fafd412100f604040ba6272e8c Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 15:02:49 -0400 Subject: [PATCH 08/20] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 4df34ccd2..d4f2bf9e4 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -90,7 +90,7 @@ js_menu_install: True # 1-PREP -# Some prefer 512MB for Zero W, others 2048MB or higher for RPi 3 and 4. +# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ pi_swap_size: 1024 From c8f8fcbf0c0174351842aaa00e6f7a157e932d70 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 15:03:05 -0400 Subject: [PATCH 09/20] Update local_vars_big.yml --- vars/local_vars_big.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 6d30ad7e5..c390824dc 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -90,7 +90,7 @@ js_menu_install: True # 1-PREP -# Some prefer 512MB for Zero W, others 2048MB or higher for RPi 3 and 4. +# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ pi_swap_size: 1024 From 162f5cb66d3e1c104394fad9e3be3595ad72876a Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 15:24:46 -0400 Subject: [PATCH 10/20] become: yes --- roles/internetarchive/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/internetarchive/tasks/main.yml b/roles/internetarchive/tasks/main.yml index e6721de9f..fcb238001 100644 --- a/roles/internetarchive/tasks/main.yml +++ b/roles/internetarchive/tasks/main.yml @@ -20,6 +20,7 @@ - name: Run yarn install to get needed modules (CAN TAKE ~15 MINUTES) command: yarn add @internetarchive/dweb-archive @internetarchive/dweb-mirror + become: yes # Escalate to root, similar to 'sudo' args: chdir: "{{ internetarchive_dir }}" creates: "{{ internetarchive_dir }}/node_modules/@internetarchive/dweb-mirror/internetarchive" @@ -74,6 +75,7 @@ - name: 'Update pre-existing install: yarn upgrade' command: yarn upgrade + become: yes # Escalate to root, similar to 'sudo' args: chdir: "{{ internetarchive_dir }}" when: not internetarchive_installing.changed and internetarchive_upgrade From ea0733ea3da490edcb97936aa144fe2cc7e3173f Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:10:17 -0400 Subject: [PATCH 11/20] redundant "when: is_debuntu" (clarify rpi_model & is_rpi issues) --- roles/1-prep/tasks/raspberry_pi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/1-prep/tasks/raspberry_pi.yml b/roles/1-prep/tasks/raspberry_pi.yml index c8b0e41f7..e8b6aaf46 100644 --- a/roles/1-prep/tasks/raspberry_pi.yml +++ b/roles/1-prep/tasks/raspberry_pi.yml @@ -37,7 +37,7 @@ path: /etc/dphys-swapfile regexp: "^CONF_SWAPSIZE" line: "CONF_SWAPSIZE={{ pi_swap_size }}" - when: is_debuntu | bool + when: is_debuntu | bool # Redundant, given raspberry_pi.yml is only run when rpi_model: "rpi" (similar to is_rpi: True). Until someone tries a non-debuntu OS on RPi? - name: Restart swap service "dphys-swapfile" (debuntu) #command: /etc/init.d/dphys-swapfile restart From 0eb5022cf4d46faa3d88c5429b08a9b4290817f7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:11:30 -0400 Subject: [PATCH 12/20] Update default_vars.yml --- vars/default_vars.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 8a08b490b..589195097 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -177,10 +177,6 @@ wan_nameserver: # 1-PREP -# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. -# Please see recommendations at: https://itsfoss.com/swap-size/ -pi_swap_size: 1024 - sshd_enabled: True # roles/iiab-admin runs here @@ -202,6 +198,10 @@ openvpn_server_port: 1194 # need_ncat is turned true by os-#.yml files that don't have ncat in nmap need_ncat: False +# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. +# Please see recommendations at: https://itsfoss.com/swap-size/ +pi_swap_size: 1024 + # 2-COMMON From 40466679732004eec875194a705e7cbdbfb838a2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:12:15 -0400 Subject: [PATCH 13/20] Update local_vars_big.yml --- vars/local_vars_big.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index c390824dc..79a44b64f 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -90,10 +90,6 @@ js_menu_install: True # 1-PREP -# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. -# Please see recommendations at: https://itsfoss.com/swap-size/ -pi_swap_size: 1024 - # roles/sshd & roles/iiab-admin run here # SEE IIAB-ADMIN VARIABLES NEAR TOP OF THIS FILE: # e.g. iiab_admin_user_install, iiab_admin_user, iiab_admin_pwd_hash @@ -106,6 +102,10 @@ openvpn_handle: # The following seems necessary on CentOS: # openvpn_cron_enabled: True +# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. +# Please see recommendations at: https://itsfoss.com/swap-size/ +pi_swap_size: 1024 + # 2-COMMON From b96dc4218de83e1c1ff043a4cdfd5591ba856e38 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:12:48 -0400 Subject: [PATCH 14/20] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index d4f2bf9e4..36806790a 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -90,10 +90,6 @@ js_menu_install: True # 1-PREP -# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. -# Please see recommendations at: https://itsfoss.com/swap-size/ -pi_swap_size: 1024 - # roles/sshd & roles/iiab-admin run here # SEE IIAB-ADMIN VARIABLES NEAR TOP OF THIS FILE: # e.g. iiab_admin_user_install, iiab_admin_user, iiab_admin_pwd_hash @@ -106,6 +102,10 @@ openvpn_handle: # The following seems necessary on CentOS: # openvpn_cron_enabled: True +# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. +# Please see recommendations at: https://itsfoss.com/swap-size/ +pi_swap_size: 1024 + # 2-COMMON From 1dcc6a16e075800d37da37f9ecbd4972062a256b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:13:26 -0400 Subject: [PATCH 15/20] Update local_vars_min.yml --- vars/local_vars_min.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 622a91c27..af7d3a165 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -90,10 +90,6 @@ js_menu_install: True # 1-PREP -# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. -# Please see recommendations at: https://itsfoss.com/swap-size/ -pi_swap_size: 1024 - # roles/sshd & roles/iiab-admin run here # SEE IIAB-ADMIN VARIABLES NEAR TOP OF THIS FILE: # e.g. iiab_admin_user_install, iiab_admin_user, iiab_admin_pwd_hash @@ -106,6 +102,10 @@ openvpn_handle: # The following seems necessary on CentOS: # openvpn_cron_enabled: True +# Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. +# Please see recommendations at: https://itsfoss.com/swap-size/ +pi_swap_size: 1024 + # 2-COMMON From 0a1e4322d0857cf7562aec64a69f9e7f930133de Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:17:25 -0400 Subject: [PATCH 16/20] pi_swap_size -> pi_swap_file_size --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 589195097..8d3400a65 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -200,7 +200,7 @@ need_ncat: False # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ -pi_swap_size: 1024 +pi_swap_file_size: 1024 # 2-COMMON From 2d140c58b99938033d77af18fcc2f1b7223ebb94 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:18:08 -0400 Subject: [PATCH 17/20] pi_swap_size -> pi_swap_file_size --- vars/local_vars_big.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 79a44b64f..2b5ce6171 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -104,7 +104,7 @@ openvpn_handle: # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ -pi_swap_size: 1024 +pi_swap_file_size: 1024 # 2-COMMON From 85181c710019cc568549261364d5faba6843128e Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:18:46 -0400 Subject: [PATCH 18/20] pi_swap_size -> pi_swap_file_size --- vars/local_vars_medium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 36806790a..d03e5ce42 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -104,7 +104,7 @@ openvpn_handle: # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ -pi_swap_size: 1024 +pi_swap_file_size: 1024 # 2-COMMON From 5e8d922b62b13d9ba774f8f58e0d731ce841bb7b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:19:22 -0400 Subject: [PATCH 19/20] pi_swap_size -> pi_swap_file_size --- vars/local_vars_min.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index af7d3a165..e93148cd6 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -104,7 +104,7 @@ openvpn_handle: # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ -pi_swap_size: 1024 +pi_swap_file_size: 1024 # 2-COMMON From bb40a345691afc1d931c6ed941b6a667eac9ef26 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 13 Aug 2019 16:20:24 -0400 Subject: [PATCH 20/20] pi_swap_size -> pi_swap_file_size --- roles/1-prep/tasks/raspberry_pi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/1-prep/tasks/raspberry_pi.yml b/roles/1-prep/tasks/raspberry_pi.yml index e8b6aaf46..11b23e651 100644 --- a/roles/1-prep/tasks/raspberry_pi.yml +++ b/roles/1-prep/tasks/raspberry_pi.yml @@ -32,11 +32,11 @@ name: ntp state: latest -- name: Increase swap file size (to CONF_SWAPSIZE={{ pi_swap_size }} in /etc/dphys-swapfile) as kalite pip download fails (debuntu) +- name: Increase swap file size (to CONF_SWAPSIZE={{ pi_swap_file_size }} in /etc/dphys-swapfile) as kalite pip download fails (debuntu) lineinfile: path: /etc/dphys-swapfile regexp: "^CONF_SWAPSIZE" - line: "CONF_SWAPSIZE={{ pi_swap_size }}" + line: "CONF_SWAPSIZE={{ pi_swap_file_size }}" when: is_debuntu | bool # Redundant, given raspberry_pi.yml is only run when rpi_model: "rpi" (similar to is_rpi: True). Until someone tries a non-debuntu OS on RPi? - name: Restart swap service "dphys-swapfile" (debuntu)