diff --git a/doc/installation.org b/doc/installation.org index 8a582cbe..58c5a4be 100644 --- a/doc/installation.org +++ b/doc/installation.org @@ -81,7 +81,7 @@ Now the easiest way to install the system is via the interactive setup. freedombone menuconfig #+END_SRC -You can select which variant you wish to install and then enter the details as requested. +You can select which variant you wish to install and then enter the details as requested. A video of the install sequence can be [[./installer.ogv][seen here]]. * Non-Interactive Setup If you don't want to install interactively then it's possible to manually create a configuration file as follows: diff --git a/src/freedombone b/src/freedombone index 82bcb08f..996abaf2 100755 --- a/src/freedombone +++ b/src/freedombone @@ -282,6 +282,9 @@ GET_IP_ADDRESS_URL="checkip.two-dns.de" # other possible services to obtain the external IP address EXTERNAL_IP_SERVICES=( \ + 'https://check.torproject.org/' \ + 'https://www.whatsmydns.net/whats-my-ip-address.html' \ + 'https://www.privateinternetaccess.com/pages/whats-my-ip/' \ 'http://checkip.two-dns.de' \ 'http://ip.dnsexit.com' \ 'http://ifconfig.me/ip' \ @@ -315,12 +318,9 @@ EXTERNAL_IP_SERVICES=( \ 'http://www.myipnumber.com/my-ip-address.asp' \ 'http://www.whatsmyipaddress.net/' \ 'http://formyip.com/' \ - 'https://check.torproject.org/' \ 'http://www.displaymyip.com/' \ 'http://www.bobborst.com/tools/whatsmyip/' \ 'http://www.geoiptool.com/' \ - 'https://www.whatsmydns.net/whats-my-ip-address.html' \ - 'https://www.privateinternetaccess.com/pages/whats-my-ip/' \ 'http://checkip.dyndns.com/' \ 'http://myexternalip.com/' \ 'http://www.ip-adress.eu/' \ diff --git a/website/installation.html b/website/installation.html index a4d7383f..f9d4adb9 100644 --- a/website/installation.html +++ b/website/installation.html @@ -4,7 +4,7 @@ - + @@ -324,7 +324,7 @@ Now the easiest way to install the system is via the interactive setup.

-You can select which variant you wish to install and then enter the details as requested. +You can select which variant you wish to install and then enter the details as requested. A video of the install sequence can be seen here.

@@ -378,20 +378,6 @@ Add the following, and set the values as needed. Both of the IP addresses are local IP addresses, typically of the form 192.168.x.x, with one being for the system and the other being for the internet router.

-

-If you are using FreeDNS as a dynamic DNS provider then you can add the following to your configuration file, setting the subdomain codes as appropriate. You can find the codes on the FreeDNS site under "Dynamic DNS" followed by "quick cron example" then look for the code on the last line between the ? and = characters. -

- -
- -
FULLBLOG_FREEDNS_SUBDOMAIN_CODE=
-REDMATRIX_FREEDNS_SUBDOMAIN_CODE=
-MICROBLOG_FREEDNS_SUBDOMAIN_CODE=
-OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=
-WIKI_FREEDNS_SUBDOMAIN_CODE=
-
-
-

Save the configuration file and exit from your editor.

@@ -417,7 +403,7 @@ Or on any other system don't include the –bbb option.

-The above command should be run in the same directory in which your configuration file exists. You can use any of your domains as the default one, but typically the default domain is the same as the one for your wiki. If you are using FreeDNS as the dynamic DNS provider then also add the -c option to specify the code corresponding to the subdomain. +The above command should be run in the same directory in which your configuration file exists. You can use any of your domains as the default one, but typically the default domain is the same as the one for your wiki.