From a7a9981d0eee46778fc8d447dff2e51c30d0a873 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 17 Aug 2017 18:19:06 +0100 Subject: [PATCH 01/13] Read matrix domain --- src/freedombone-app-matrix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index 97aa4c6f..01e2164f 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -314,6 +314,7 @@ function add_user_matrix { new_user_password="$2" is_admin_user='-a' + read_config_param MY_USERNAME if [[ "$new_username" != "$MY_USERNAME" ]]; then is_admin_user='' fi @@ -321,6 +322,7 @@ function add_user_matrix { ${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password" if [[ $ONION_ONLY == 'no' ]]; then + read_config_param MATRIX_DOMAIN_NAME retval=$(register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user https://${MATRIX_DOMAIN_NAME}) else retval=$(register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user http://${MATRIX_DOMAIN_NAME}) From 0e36a43ae01f7a115800f500a163e4cb0d5e61e5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 17 Aug 2017 18:22:37 +0100 Subject: [PATCH 02/13] Adding matrix user --- src/freedombone-app-matrix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index 01e2164f..c8ab24c3 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -315,6 +315,9 @@ function add_user_matrix { is_admin_user='-a' read_config_param MY_USERNAME + read_config_param ONION_ONLY + read_config_param MATRIX_DOMAIN_NAME + if [[ "$new_username" != "$MY_USERNAME" ]]; then is_admin_user='' fi @@ -322,10 +325,9 @@ function add_user_matrix { ${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password" if [[ $ONION_ONLY == 'no' ]]; then - read_config_param MATRIX_DOMAIN_NAME - retval=$(register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user https://${MATRIX_DOMAIN_NAME}) + register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user https://${MATRIX_DOMAIN_NAME} else - retval=$(register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user http://${MATRIX_DOMAIN_NAME}) + register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user http://${MATRIX_DOMAIN_NAME} fi echo "0" } From 8c0afcc08e6f8cf8cefc67642f2790be43129efd Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 17 Aug 2017 19:01:00 +0100 Subject: [PATCH 03/13] Adding matrix users --- src/freedombone-app-matrix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index c8ab24c3..fac768f7 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -312,22 +312,16 @@ function remove_user_matrix { function add_user_matrix { new_username="$1" new_user_password="$2" - is_admin_user='-a' read_config_param MY_USERNAME - read_config_param ONION_ONLY read_config_param MATRIX_DOMAIN_NAME - if [[ "$new_username" != "$MY_USERNAME" ]]; then - is_admin_user='' - fi - ${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password" - if [[ $ONION_ONLY == 'no' ]]; then - register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user https://${MATRIX_DOMAIN_NAME} + if [[ "$new_username" != "$MY_USERNAME" ]]; then + echo 'no' | register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" http://localhost:${MATRIX_PORT} else - register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user http://${MATRIX_DOMAIN_NAME} + echo 'yes' | register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" -a http://localhost:${MATRIX_PORT} fi echo "0" } From 5db39cb66e2914ea90ae324468123d7308a07621 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 17 Aug 2017 19:24:49 +0100 Subject: [PATCH 04/13] Keep track of ghost version So that we're not upgrading every time --- src/freedombone-app-ghost | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/freedombone-app-ghost b/src/freedombone-app-ghost index 46c0a8fd..a98a94df 100755 --- a/src/freedombone-app-ghost +++ b/src/freedombone-app-ghost @@ -34,6 +34,7 @@ VARIANTS="full full-vim writer" IN_DEFAULT_INSTALL=0 SHOW_ON_ABOUT=1 +GHOST_VERSION=1.0.2 GHOST_DOMAIN_NAME= GHOST_CODE= GHOST_ONION_PORT=8104 @@ -53,6 +54,9 @@ function ghost_bust { kill_pid=$(ps aux | grep "ghost" | awk -F ' ' '{print $2}' | head -n 1) kill -9 $kill_pid + + kill_pid=$(ps aux | grep "ghost" | awk -F ' ' '{print $2}' | head -n 1) + kill -9 $kill_pid } function logging_on_ghost { @@ -188,6 +192,11 @@ function reconfigure_ghost { } function upgrade_ghost { + CURR_GHOST_VERSION=$(get_completion_param "ghost version") + if [[ "${CURR_GHOST_VERSION}" == "${GHOST_VERSION}" ]]; then + return + fi + read_config_param GHOST_DOMAIN_NAME if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then @@ -195,6 +204,7 @@ function upgrade_ghost { fi systemctl stop ghost + ghost_bust cd /var/www/$GHOST_DOMAIN_NAME/htdocs @@ -209,6 +219,7 @@ function upgrade_ghost { chown -R root:root /usr/local/lib chown -R ghost: /var/www/${GHOST_DOMAIN_NAME}/htdocs systemctl restart ghost + sed -i "s|ghost version.*|ghost version:${GHOST_VERSION}|g" ${COMPLETION_FILE} } function backup_local_ghost { From 5f59166a887883c5e261e4146abed8fc266fed88 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 17 Aug 2017 19:30:45 +0100 Subject: [PATCH 05/13] ghost version --- src/freedombone-app-ghost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freedombone-app-ghost b/src/freedombone-app-ghost index a98a94df..8c44a2da 100755 --- a/src/freedombone-app-ghost +++ b/src/freedombone-app-ghost @@ -34,7 +34,7 @@ VARIANTS="full full-vim writer" IN_DEFAULT_INSTALL=0 SHOW_ON_ABOUT=1 -GHOST_VERSION=1.0.2 +GHOST_VERSION=1.6.2 GHOST_DOMAIN_NAME= GHOST_CODE= GHOST_ONION_PORT=8104 From 43bd30463ef07dd5e157326e6d570727d79c6947 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 18 Aug 2017 12:18:02 +0100 Subject: [PATCH 06/13] Bump cryptpad commit --- src/freedombone-app-cryptpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freedombone-app-cryptpad b/src/freedombone-app-cryptpad index 44722da7..29121c81 100755 --- a/src/freedombone-app-cryptpad +++ b/src/freedombone-app-cryptpad @@ -37,7 +37,7 @@ SHOW_ICANN_ADDRESS_ON_ABOUT=0 CRYPTPAD_ONION_PORT=8119 CRYPTPAD_PORT=9003 CRYPTPAD_REPO="https://github.com/xwiki-labs/cryptpad" -CRYPTPAD_COMMIT='0b69973c179efc6f770a1127f07f67de3d6724d1' +CRYPTPAD_COMMIT='52d344c3d1404d75d2bf4ae8845e5c024e85ec7f' CRYPTPAD_DIR=/etc/cryptpad cryptpad_variables=(ONION_ONLY) From d66536ab401ce94db8c339a1ddbc244d73912f50 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 18 Aug 2017 12:55:53 +0100 Subject: [PATCH 07/13] No cryptpad login screen --- src/freedombone-app-cryptpad | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/freedombone-app-cryptpad b/src/freedombone-app-cryptpad index 29121c81..c184f97b 100755 --- a/src/freedombone-app-cryptpad +++ b/src/freedombone-app-cryptpad @@ -283,6 +283,10 @@ function install_cryptpad_main { echo ' try_files $uri =404;' >> $cryptpad_nginx_site echo ' }' >> $cryptpad_nginx_site echo '' >> $cryptpad_nginx_site + echo ' location ^~ /login/ {' >> $cryptpad_nginx_site + echo ' try_files $uri =404;' >> $cryptpad_nginx_site + echo ' }' >> $cryptpad_nginx_site + echo '' >> $cryptpad_nginx_site echo ' location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media)$ {' >> $cryptpad_nginx_site echo ' rewrite ^(.*)$ $1/ redirect;' >> $cryptpad_nginx_site echo ' }' >> $cryptpad_nginx_site From 1e489fdeb0d3bf7f006f39ab782807585c56e884 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 18 Aug 2017 13:00:53 +0100 Subject: [PATCH 08/13] Block some other cryptpad links, so that the version number isn't obvious --- src/freedombone-app-cryptpad | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/freedombone-app-cryptpad b/src/freedombone-app-cryptpad index c184f97b..7b3e6712 100755 --- a/src/freedombone-app-cryptpad +++ b/src/freedombone-app-cryptpad @@ -287,6 +287,22 @@ function install_cryptpad_main { echo ' try_files $uri =404;' >> $cryptpad_nginx_site echo ' }' >> $cryptpad_nginx_site echo '' >> $cryptpad_nginx_site + echo ' location ^~ /about.html {' >> $cryptpad_nginx_site + echo ' try_files $uri =404;' >> $cryptpad_nginx_site + echo ' }' >> $cryptpad_nginx_site + echo '' >> $cryptpad_nginx_site + echo ' location ^~ /contact.html {' >> $cryptpad_nginx_site + echo ' try_files $uri =404;' >> $cryptpad_nginx_site + echo ' }' >> $cryptpad_nginx_site + echo '' >> $cryptpad_nginx_site + echo ' location ^~ /contact.html {' >> $cryptpad_nginx_site + echo ' try_files $uri =404;' >> $cryptpad_nginx_site + echo ' }' >> $cryptpad_nginx_site + echo '' >> $cryptpad_nginx_site + echo ' location ^~ /what-is-cryptpad.html {' >> $cryptpad_nginx_site + echo ' try_files $uri =404;' >> $cryptpad_nginx_site + echo ' }' >> $cryptpad_nginx_site + echo '' >> $cryptpad_nginx_site echo ' location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media)$ {' >> $cryptpad_nginx_site echo ' rewrite ^(.*)$ $1/ redirect;' >> $cryptpad_nginx_site echo ' }' >> $cryptpad_nginx_site From 74bc296552e4cc2eaa8e633923b526874d01058a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 21 Aug 2017 21:11:56 +0100 Subject: [PATCH 09/13] Bump gnusocial and pleroma commits --- src/freedombone-app-gnusocial | 2 +- src/freedombone-utils-gnusocialtools | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index 7643bfc9..de77136d 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -37,7 +37,7 @@ GNUSOCIAL_DOMAIN_NAME= GNUSOCIAL_CODE= GNUSOCIAL_ONION_PORT=8087 GNUSOCIAL_REPO="https://git.gnu.io/gnu/gnu-social.git" -GNUSOCIAL_COMMIT='05a9c11c476b384e5ef3f3cc83b66406fcf7a378' +GNUSOCIAL_COMMIT='d61375cb7fd9e3ac2dbba2b22d0d6461fb753892' GNUSOCIAL_ADMIN_PASSWORD= GNUSOCIAL_BACKGROUND_IMAGE_URL= diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools index 758c3129..7885ff08 100755 --- a/src/freedombone-utils-gnusocialtools +++ b/src/freedombone-utils-gnusocialtools @@ -33,7 +33,7 @@ QVITTER_THEME_REPO="https://git.postactiv.com/bob/Qvitter" QVITTER_THEME_COMMIT='b5791cf935a6391c492cefa1ffa50cc3cea44c12' PLEROMA_REPO="https://gitgud.io/lambadalambda/pleroma-fe" -PLEROMA_COMMIT='7d59051fc5e93585d8d9858ac989d9ebf7aa3cf9' +PLEROMA_COMMIT='cbe652f2d94d81fa54a37378b7ff014c4391ca5e' ARMADILLO_REPO="https://git.postactiv.com/maiya/Armadillo" ARMADILLO_COMMIT='ec3938a678f373156c4cbf37926c9a5ab68222c4' @@ -409,6 +409,7 @@ function install_pleroma_front_end { npm install -g eslint-plugin-promise@3.5.0 npm install -g moment@2.18.1 npm install -g node-sass@4.5.2 + npm install -g whatwg-fetch@2.0.3 yarn if [ -f $INSTALL_DIR/pleroma/dist/index.html ]; then rm -rf $INSTALL_DIR/pleroma/dist/* @@ -452,6 +453,7 @@ function upgrade_pleroma { if [ -d $INSTALL_DIR/pleroma ]; then set_repo_commit $INSTALL_DIR/pleroma "${app_name} pleroma commit" "$PLEROMA_COMMIT" $PLEROMA_REPO cd $INSTALL_DIR/pleroma + yarn npm run build if [ ! -d $INSTALL_DIR/pleroma/dist ]; then echo 'Unable to build pleroma' From 79dd2521dbb1df17ae4bf1d6470e7e6bf534ac0d Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 21 Aug 2017 21:45:27 +0100 Subject: [PATCH 10/13] Bump pihole commit --- src/freedombone-app-pihole | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole index 59923bf2..7b9a8c6b 100755 --- a/src/freedombone-app-pihole +++ b/src/freedombone-app-pihole @@ -47,7 +47,7 @@ PIHOLE_BLACKLIST=$piholeDir/blacklist.txt PIHOLE_WHITELIST=$piholeDir/whitelist.txt PIHOLE_REPO="https://github.com/pi-hole/pi-hole" -PIHOLE_COMMIT='bef0a2fef08b39780610b8885407b855edd3ba49' +PIHOLE_COMMIT='2ceeac41fe8e493f9040b54a7c82f1183ecf5566' pihole_variables=(ONION_ONLY PIHOLE_IFACE From fe107b6fe57c3e51a984f07aeb103e1d7161edcb Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 21 Aug 2017 22:32:11 +0100 Subject: [PATCH 11/13] Update pihole setup instructions --- doc/EN/app_pihole.org | 25 +++++++++------ website/EN/app_pihole.html | 65 +++++++++++++++++++++----------------- 2 files changed, 52 insertions(+), 38 deletions(-) diff --git a/doc/EN/app_pihole.org b/doc/EN/app_pihole.org index 24d79a09..4abf9111 100644 --- a/doc/EN/app_pihole.org +++ b/doc/EN/app_pihole.org @@ -32,21 +32,28 @@ When that's done select *About this system* from the control panel and see the I * On each client system within your local network +On Arch/Parabola: + #+begin_src bash +sudo pacman -S openresolv +STATIC_IP=[your server static IP] +sudo sed -i "s|#name_servers=.*|name_servers=$STATIC_IP|g" /etc/resolvconf.conf +sudo sed -i "s|name_servers=.*|name_servers=$STATIC_IP|g" /etc/resolvconf.conf sudo chattr -i /etc/resolv.conf -sudo nano /etc/resolv.conf +sudo resolvconf -u #+end_src -Comment out any existing entries with a # character and add: +Or on a Debian based sustem: #+begin_src bash -nameserver [IPv4 address from the About screen] -#+end_src - -Normally /resolv.conf/ will be overwritten every time your reboot, but you can prevent this with: - -#+begin_src bash -sudo chattr +i /etc/resolv.conf +sudo apt-get install resolvconf +STATIC_IP=[your server static IP] +echo 'domain localdomain' > /tmp/resolvconf +echo 'search localdomain' >> /tmp/resolvconf +echo "nameserver $STATIC_IP" >> /tmp/resolvconf +sudo mv /tmp/resolvconf /etc/resolvconf/resolv.conf.d/head +sudo chattr -i /etc/resolv.conf +sudo resolvconf -u #+end_src * On your internet router diff --git a/website/EN/app_pihole.html b/website/EN/app_pihole.html index 148c696e..9b3f1d3e 100644 --- a/website/EN/app_pihole.html +++ b/website/EN/app_pihole.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -71,6 +71,7 @@ pre.src-fortran:before { content: 'Fortran'; } pre.src-gnuplot:before { content: 'gnuplot'; } pre.src-haskell:before { content: 'Haskell'; } + pre.src-hledger:before { content: 'hledger'; } pre.src-java:before { content: 'Java'; } pre.src-js:before { content: 'Javascript'; } pre.src-latex:before { content: 'LaTeX'; } @@ -188,7 +189,7 @@ @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012-2013 Free Software Foundation, Inc. +Copyright (C) 2012-2017 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU @@ -263,9 +264,9 @@ You can block ads for any devices connected to your local network by installing Also don't expect perfection. Though many ads may be blocked by this system some will still get through. It's a constant cat and mouse game between advertisers and blockers.

-
-

Set a static IP address

-
+
+

Set a static IP address

+

Ensure that your system has a static local IP address (typically 192.168..) using the option on the control panel. You will also need to know the IP address of your internet router, which is usually 192.168.1.1 or 192.168.1.254.

@@ -276,38 +277,44 @@ When that's done select About this system from the control panel and see
-
-

On each client system within your local network

-
-
-
sudo chattr -i /etc/resolv.conf
-sudo nano /etc/resolv.conf
-
-
- +
+

On each client system within your local network

+

-Comment out any existing entries with a # character and add: +On Arch/Parabola:

-
nameserver [IPv4 address from the About screen]
-
+
sudo pacman -S openresolv
+STATIC_IP=[your server static IP]
+sudo sed -i "s|#name_servers=.*|name_servers=$STATIC_IP|g" /etc/resolvconf.conf
+sudo sed -i "s|name_servers=.*|name_servers=$STATIC_IP|g" /etc/resolvconf.conf
+sudo chattr -i /etc/resolv.conf
+sudo resolvconf -u
+

-Normally resolv.conf will be overwritten every time your reboot, but you can prevent this with: +Or on a Debian based sustem:

-
sudo chattr +i /etc/resolv.conf
-
+
sudo apt-get install resolvconf
+STATIC_IP=[your server static IP]
+echo 'domain localdomain' > /tmp/resolvconf
+echo 'search localdomain' >> /tmp/resolvconf
+echo "nameserver $STATIC_IP" >> /tmp/resolvconf
+sudo mv /tmp/resolvconf /etc/resolvconf/resolv.conf.d/head
+sudo chattr -i /etc/resolv.conf
+sudo resolvconf -u
+
-
-

On your internet router

-
+
+

On your internet router

+

If you can access the settings on your local internet router then this is the simplest way to provide ad blocking for all devices which connect to it. Unfortunately some router models don't let you edit the DNS settings and if that's the case you might want to consider getting a different router.

@@ -317,9 +324,9 @@ Edit the DNS settings and add the IPv4 address which you got from the control pa

-
-

LibreCMC

-
+
+

LibreCMC

+

On a router running LibreCMC from the Network menu select DHCP and DNS. Enter the static IP address of your Freedombone system within DNS Forwardings, then at the bottom of the page click on Save & Apply. Any devices which connect to your router will now have ad blocking.

@@ -327,9 +334,9 @@ On a router running LibreCMC from the Network menu select DHCP and DNS
-
-

Configuring block lists

-
+
+

Configuring block lists

+

You can configure the block lists which the system uses by going to the administrator control panel, selecting App Settings then choosing pihole. You can also add any extra domain names to the whitelist if they're being wrongly blocked or to the blacklist if they're not blocked by the current lists.

From c72c4fe7546beb686941a624713c9d0509d15de7 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 21 Aug 2017 22:43:44 +0100 Subject: [PATCH 12/13] Typo --- doc/EN/app_pihole.org | 2 +- website/EN/app_pihole.html | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/EN/app_pihole.org b/doc/EN/app_pihole.org index 4abf9111..92b9dd7a 100644 --- a/doc/EN/app_pihole.org +++ b/doc/EN/app_pihole.org @@ -43,7 +43,7 @@ sudo chattr -i /etc/resolv.conf sudo resolvconf -u #+end_src -Or on a Debian based sustem: +Or on a Debian based system: #+begin_src bash sudo apt-get install resolvconf diff --git a/website/EN/app_pihole.html b/website/EN/app_pihole.html index 9b3f1d3e..c61ed6b2 100644 --- a/website/EN/app_pihole.html +++ b/website/EN/app_pihole.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -264,9 +264,9 @@ You can block ads for any devices connected to your local network by installing Also don't expect perfection. Though many ads may be blocked by this system some will still get through. It's a constant cat and mouse game between advertisers and blockers.

-
-

Set a static IP address

-
+
+

Set a static IP address

+

Ensure that your system has a static local IP address (typically 192.168..) using the option on the control panel. You will also need to know the IP address of your internet router, which is usually 192.168.1.1 or 192.168.1.254.

@@ -277,9 +277,9 @@ When that's done select About this system from the control panel and see
-
-

On each client system within your local network

-
+
+

On each client system within your local network

+

On Arch/Parabola:

@@ -295,7 +295,7 @@ sudo resolvconf -u

-Or on a Debian based sustem: +Or on a Debian based system:

@@ -312,9 +312,9 @@ sudo resolvconf -u
-
-

On your internet router

-
+
+

On your internet router

+

If you can access the settings on your local internet router then this is the simplest way to provide ad blocking for all devices which connect to it. Unfortunately some router models don't let you edit the DNS settings and if that's the case you might want to consider getting a different router.

@@ -324,9 +324,9 @@ Edit the DNS settings and add the IPv4 address which you got from the control pa

-
-

LibreCMC

-
+
+

LibreCMC

+

On a router running LibreCMC from the Network menu select DHCP and DNS. Enter the static IP address of your Freedombone system within DNS Forwardings, then at the bottom of the page click on Save & Apply. Any devices which connect to your router will now have ad blocking.

@@ -334,9 +334,9 @@ On a router running LibreCMC from the Network menu select DHCP and DNS
-
-

Configuring block lists

-
+
+

Configuring block lists

+

You can configure the block lists which the system uses by going to the administrator control panel, selecting App Settings then choosing pihole. You can also add any extra domain names to the whitelist if they're being wrongly blocked or to the blacklist if they're not blocked by the current lists.

From 36d73b2a6cb8ce111319c2f4188f9929a587b2a5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 22 Aug 2017 10:51:03 +0100 Subject: [PATCH 13/13] Note about hosts file for pi-hole --- doc/EN/app_pihole.org | 9 ++++++-- website/EN/app_pihole.html | 44 ++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/doc/EN/app_pihole.org b/doc/EN/app_pihole.org index 92b9dd7a..24bf68c9 100644 --- a/doc/EN/app_pihole.org +++ b/doc/EN/app_pihole.org @@ -32,11 +32,17 @@ When that's done select *About this system* from the control panel and see the I * On each client system within your local network +Make sure that you add the static IP address for the server to */etc/hosts*. + +#+begin_src bash +STATIC_IP=[your server static IP] +sudo echo "$STATIC_IP [your domain name]" >> /etc/hosts +#+end_src + On Arch/Parabola: #+begin_src bash sudo pacman -S openresolv -STATIC_IP=[your server static IP] sudo sed -i "s|#name_servers=.*|name_servers=$STATIC_IP|g" /etc/resolvconf.conf sudo sed -i "s|name_servers=.*|name_servers=$STATIC_IP|g" /etc/resolvconf.conf sudo chattr -i /etc/resolv.conf @@ -47,7 +53,6 @@ Or on a Debian based system: #+begin_src bash sudo apt-get install resolvconf -STATIC_IP=[your server static IP] echo 'domain localdomain' > /tmp/resolvconf echo 'search localdomain' >> /tmp/resolvconf echo "nameserver $STATIC_IP" >> /tmp/resolvconf diff --git a/website/EN/app_pihole.html b/website/EN/app_pihole.html index c61ed6b2..65a57a41 100644 --- a/website/EN/app_pihole.html +++ b/website/EN/app_pihole.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -264,9 +264,9 @@ You can block ads for any devices connected to your local network by installing Also don't expect perfection. Though many ads may be blocked by this system some will still get through. It's a constant cat and mouse game between advertisers and blockers.

-
-

Set a static IP address

-
+
+

Set a static IP address

+

Ensure that your system has a static local IP address (typically 192.168..) using the option on the control panel. You will also need to know the IP address of your internet router, which is usually 192.168.1.1 or 192.168.1.254.

@@ -277,16 +277,25 @@ When that's done select About this system from the control panel and see
-
-

On each client system within your local network

-
+
+

On each client system within your local network

+
+

+Make sure that you add the static IP address for the server to /etc/hosts. +

+ +
+
STATIC_IP=[your server static IP]
+sudo echo "$STATIC_IP [your domain name]" >> /etc/hosts
+
+
+

On Arch/Parabola: 

sudo pacman -S openresolv
-STATIC_IP=[your server static IP]
 sudo sed -i "s|#name_servers=.*|name_servers=$STATIC_IP|g" /etc/resolvconf.conf
 sudo sed -i "s|name_servers=.*|name_servers=$STATIC_IP|g" /etc/resolvconf.conf
 sudo chattr -i /etc/resolv.conf
@@ -300,7 +309,6 @@ Or on a Debian based system:
 
 

 
sudo apt-get install resolvconf
-STATIC_IP=[your server static IP]
 echo 'domain localdomain' > /tmp/resolvconf
 echo 'search localdomain' >> /tmp/resolvconf
 echo "nameserver $STATIC_IP" >> /tmp/resolvconf
@@ -312,9 +320,9 @@ sudo resolvconf -u
-
-

On your internet router

-
+
+

On your internet router

+

If you can access the settings on your local internet router then this is the simplest way to provide ad blocking for all devices which connect to it. Unfortunately some router models don't let you edit the DNS settings and if that's the case you might want to consider getting a different router.

@@ -324,9 +332,9 @@ Edit the DNS settings and add the IPv4 address which you got from the control pa

-
-

LibreCMC

-
+
+

LibreCMC

+

On a router running LibreCMC from the Network menu select DHCP and DNS. Enter the static IP address of your Freedombone system within DNS Forwardings, then at the bottom of the page click on Save & Apply. Any devices which connect to your router will now have ad blocking.

@@ -334,9 +342,9 @@ On a router running LibreCMC from the Network menu select DHCP and DNS
-
-

Configuring block lists

-
+
+

Configuring block lists

+

You can configure the block lists which the system uses by going to the administrator control panel, selecting App Settings then choosing pihole. You can also add any extra domain names to the whitelist if they're being wrongly blocked or to the blacklist if they're not blocked by the current lists.