From 33abe47dce5333436f42dab25681552f705314c7 Mon Sep 17 00:00:00 2001
From: songz <songzmeng@gmail.com>
Date: Tue, 12 Feb 2019 02:35:12 +0800
Subject: [PATCH 1/2] add aria2 config option: rpc allow origin all to fix
 using 3rd party plugin; and comment unknown option;

---
 dietpi/dietpi-software | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 67eb37632f..44b426c8ae 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -11107,12 +11107,12 @@ _EOF_
 			G_BACKUP_FP /var/lib/dietpi/dietpi-software/installed/aria2.conf
 			cat << _EOF_ > /var/lib/dietpi/dietpi-software/installed/aria2.conf
 # host is where aria2c is running on
-host=localhost
+# host=localhost
 dir=$G_FP_DIETPI_USERDATA/$FOLDER_DOWNLOADS
 
 # cleanup_policy
-cleanup-policy=clean_got
-cleanup-percent=90%
+# cleanup-policy=clean_got
+# cleanup-percent=90%
 
 # The fallowing options are aria2c options as usual aria2.conf file
 # https://aria2.github.io/manual/en/html/aria2c.html
@@ -11122,6 +11122,7 @@ enable-rpc=true
 rpc-listen-all=true
 rpc-listen-port=6800
 rpc-secret=$GLOBAL_PW
+rpc-allow-origin-all=true
 pause=false
 
 # General Options
@@ -11148,18 +11149,18 @@ max-download-limit=0
 seed-ratio=0.1
 seed-time=0
 
-metalink-servers=$(Optimize_BitTorrent 2)
+# metalink-servers=$(Optimize_BitTorrent 2)
 allow-overwrite=false
 always-resume=true
 auto-file-renaming=false
 file-allocation=none
 
-[limit-options]
+# [limit-options]
 max-concurrent-downloads=$(Optimize_BitTorrent 1)
 max-overall-download-limit=1000K
 max-overall-upload-limit=100K
 
-[unlimit-options]
+# [unlimit-options]
 max-concurrent-downloads=$(Optimize_BitTorrent 1)
 max-overall-download-limit=0
 max-overall-upload-limit=0

From 0a90f864793e92341870d78d06736bd2c9f980c3 Mon Sep 17 00:00:00 2001
From: MichaIng <28480705+MichaIng@users.noreply.github.com>
Date: Mon, 11 Feb 2019 22:35:21 +0100
Subject: [PATCH 2/2] v6.22

+ DietPi-Software | Aria2: Remove deprecated settings (instead of comment only); Remove doubled settings; Add bandwidth limit info
---
 dietpi/dietpi-software | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 44b426c8ae..7ce410d614 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -11106,17 +11106,12 @@ _EOF_
 
 			G_BACKUP_FP /var/lib/dietpi/dietpi-software/installed/aria2.conf
 			cat << _EOF_ > /var/lib/dietpi/dietpi-software/installed/aria2.conf
-# host is where aria2c is running on
-# host=localhost
-dir=$G_FP_DIETPI_USERDATA/$FOLDER_DOWNLOADS
-
-# cleanup_policy
-# cleanup-policy=clean_got
-# cleanup-percent=90%
-
 # The fallowing options are aria2c options as usual aria2.conf file
 # https://aria2.github.io/manual/en/html/aria2c.html
 
+# Download directory
+dir=$G_FP_DIETPI_USERDATA/$FOLDER_DOWNLOADS
+
 # RPC Options
 enable-rpc=true
 rpc-listen-all=true
@@ -11134,6 +11129,9 @@ continue=true
 check-integrity=true
 max-concurrent-downloads=$(Optimize_BitTorrent 1)
 max-connection-per-server=$(Optimize_BitTorrent 1)
+# Bandwidth limits: https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-max-overall-upload-limit
+max-overall-download-limit=0
+max-overall-upload-limit=0
 max-file-not-found=3
 max-tries=5
 retry-wait=60
@@ -11149,21 +11147,10 @@ max-download-limit=0
 seed-ratio=0.1
 seed-time=0
 
-# metalink-servers=$(Optimize_BitTorrent 2)
 allow-overwrite=false
 always-resume=true
 auto-file-renaming=false
 file-allocation=none
-
-# [limit-options]
-max-concurrent-downloads=$(Optimize_BitTorrent 1)
-max-overall-download-limit=1000K
-max-overall-upload-limit=100K
-
-# [unlimit-options]
-max-concurrent-downloads=$(Optimize_BitTorrent 1)
-max-overall-download-limit=0
-max-overall-upload-limit=0
 _EOF_
 
 			cat << _EOF_ > /etc/systemd/system/aria2.service