diff --git a/demo/config-index.local.toml b/demo/config-index.local.toml index 8fa7b5b..bd53658 100644 --- a/demo/config-index.local.toml +++ b/demo/config-index.local.toml @@ -1,47 +1,10 @@ -log_level = "info" - -[website] -name = "Torrust" - [tracker] -url = "udp://localhost:6969" -mode = "Public" api_url = "http://tracker:1212" -token = "MyAccessToken" -token_valid_seconds = 7257600 - -[net] -port = 3001 - -[auth] -email_on_signup = "Optional" -min_password_length = 6 -max_password_length = 64 -secret_key = "MaxVerstappenWC2021" [database] connect_url = "sqlite:///var/lib/torrust/index/database/torrust_index_demo.db?mode=rwc" # SQLite #connect_url = "mysql://root:root_secret_password@mysql:3306/torrust_index_demo" # MySQL [mail] -email_verification_enabled = false -from = "example@email.com" -reply_to = "noreply@email.com" -username = "" -password = "" server = "mailcatcher" port = 1025 - -[image_cache] -max_request_timeout_ms = 1000 -capacity = 128000000 -entry_size_limit = 4000000 -user_quota_period_seconds = 3600 -user_quota_bytes = 64000000 - -[api] -default_torrent_page_size = 10 -max_torrent_page_size = 30 - -[tracker_statistics_importer] -torrent_info_update_interval = 3600 diff --git a/demo/config-tracker.local.toml b/demo/config-tracker.local.toml index bfb1dae..c534b5f 100644 --- a/demo/config-tracker.local.toml +++ b/demo/config-tracker.local.toml @@ -1,35 +1,9 @@ -log_level = "info" -mode = "public" -db_driver = "Sqlite3" db_path = "/var/lib/torrust/tracker/database/torrust_tracker_demo.db" # SQLite #db_path = "mysql://root:root_secret_password@mysql:3306/torrust_tracker_demo" # MySQL -announce_interval = 120 -min_announce_interval = 120 -max_peer_timeout = 900 -on_reverse_proxy = false -external_ip = "0.0.0.0" -tracker_usage_statistics = true -persistent_torrent_completed_stat = false -inactive_peer_cleanup_interval = 600 -remove_peerless_torrents = true [[udp_trackers]] enabled = true -bind_address = "0.0.0.0:6969" - -[[http_trackers]] -enabled = false -bind_address = "0.0.0.0:7070" -ssl_enabled = false -ssl_cert_path = "" -ssl_key_path = "" [http_api] enabled = true bind_address = "0.0.0.0:1212" -ssl_enabled = false -ssl_cert_path = "" -ssl_key_path = "" - -[http_api.access_tokens] -admin = "MyAccessToken" diff --git a/droplet/.env.production b/droplet/.env.production index 8fb7771..99613d4 100644 --- a/droplet/.env.production +++ b/droplet/.env.production @@ -6,8 +6,9 @@ NITRO_HOST="0.0.0.0" NITRO_PORT=3000 # Index -TORRUST_INDEX_CONFIG= -TORRUST_INDEX_TRACKER_API_TOKEN='MyAccessToken' +TORRUST_INDEX_CONFIG_TOML= +TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken' +TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MyAccessToken' TORRUST_INDEX_API_CORS_PERMISSIVE=false # Tracker diff --git a/droplet/README.md b/droplet/README.md index 52f4e4c..cfcf6f5 100644 --- a/droplet/README.md +++ b/droplet/README.md @@ -27,7 +27,7 @@ cd torrust-compose/droplet Edit the `.env` file to change the default Tracker API token: ```console -TORRUST_INDEX_TRACKER_API_TOKEN="your_secret_token" +TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN="your_secret_token" TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN="your_secret_token" ``` diff --git a/droplet/bin/install.sh b/droplet/bin/install.sh index a4a9c1e..925b654 100755 --- a/droplet/bin/install.sh +++ b/droplet/bin/install.sh @@ -23,8 +23,12 @@ mkdir -p ./storage/certbot/lib ## Index -# Generate the Index sqlite database directory and file if it does not exist +mkdir -p ./storage/index/etc mkdir -p ./storage/index/lib/database +mkdir -p ./storage/index/lib/tls +mkdir -p ./storage/index/log + +# Generate the Index sqlite database directory and file if it does not exist if ! [ -f "./storage/index/lib/database/sqlite3.db" ]; then echo "Creating index database: './storage/index/lib/database/sqlite3.db'" @@ -40,8 +44,12 @@ fi ## Tracker -# Generate the Tracker sqlite database directory and file if it does not exist +mkdir -p ./storage/tracker/etc mkdir -p ./storage/tracker/lib/database +mkdir -p ./storage/tracker/lib/tls +mkdir -p ./storage/tracker/lib/log + +# Generate the Tracker sqlite database directory and file if it does not exist if ! [ -f "./storage/tracker/lib/database/sqlite3.db" ]; then echo "Creating tracker database: './storage/tracker/lib/database/sqlite3.db'" diff --git a/droplet/compose.yaml b/droplet/compose.yaml index 29a530d..5f6dc06 100644 --- a/droplet/compose.yaml +++ b/droplet/compose.yaml @@ -73,7 +73,7 @@ services: - USER_ID=${USER_ID} - TORRUST_INDEX_DATABASE=${TORRUST_INDEX_DATABASE:-sqlite3} - TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_INDEX_DATABASE_DRIVER:-sqlite3} - - TORRUST_INDEX_TRACKER_API_TOKEN=${TORRUST_INDEX_TRACKER_API_TOKEN:-MyAccessToken} + - TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN=${TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN:-MyAccessToken} - TORRUST_INDEX_API_CORS_PERMISSIVE=${TORRUST_INDEX_API_CORS_PERMISSIVE:-true} networks: - backend_network diff --git a/droplet/share/container/default/config/index.prod.container.sqlite3.toml b/droplet/share/container/default/config/index.prod.container.sqlite3.toml index 9ea5e75..4d9b53d 100644 --- a/droplet/share/container/default/config/index.prod.container.sqlite3.toml +++ b/droplet/share/container/default/config/index.prod.container.sqlite3.toml @@ -1,51 +1,16 @@ -log_level = "info" - -[website] -name = "Torrust" - -# Please override the tracker token setting the -# `TORRUST_INDEX_TRACKER_API_TOKEN` -# environmental variable! +# Please override the tracker token: +# `TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN` +# And the auth screte key: +# `TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY` +# environmental variables! [tracker] url = "udp://tracker.torrust-demo.com:6969" -mode = "Public" api_url = "http://tracker:1212" -token = "MyAccessToken" -token_valid_seconds = 7257600 - -[net] -port = 3001 - -[auth] -email_on_signup = "Optional" -min_password_length = 6 -max_password_length = 64 -secret_key = "MaxVerstappenWC2021" [database] connect_url = "sqlite:///var/lib/torrust/index/database/sqlite3.db?mode=rwc" [mail] -email_verification_enabled = false -from = "example@email.com" -reply_to = "noreply@email.com" -username = "" -password = "" server = "mailcatcher" port = 1025 - -[image_cache] -max_request_timeout_ms = 1000 -capacity = 128000000 -entry_size_limit = 4000000 -user_quota_period_seconds = 3600 -user_quota_bytes = 64000000 - -[api] -default_torrent_page_size = 10 -max_torrent_page_size = 30 - -[tracker_statistics_importer] -torrent_info_update_interval = 3600 -port = 3002 diff --git a/droplet/share/container/default/config/tracker.prod.container.sqlite3.toml b/droplet/share/container/default/config/tracker.prod.container.sqlite3.toml index f14abd1..62c6b37 100644 --- a/droplet/share/container/default/config/tracker.prod.container.sqlite3.toml +++ b/droplet/share/container/default/config/tracker.prod.container.sqlite3.toml @@ -1,41 +1,14 @@ -announce_interval = 300 -db_driver = "Sqlite3" +# Please override the admin token setting the +# `TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN` +# environmental variable! + db_path = "/var/lib/torrust/tracker/database/sqlite3.db" -external_ip = "0.0.0.0" -inactive_peer_cleanup_interval = 600 -log_level = "info" -max_peer_timeout = 900 -min_announce_interval = 300 -mode = "public" -on_reverse_proxy = true -persistent_torrent_completed_stat = true -remove_peerless_torrents = true -tracker_usage_statistics = true [[udp_trackers]] -bind_address = "0.0.0.0:6969" enabled = true [[http_trackers]] -bind_address = "0.0.0.0:7070" enabled = true -ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt" -ssl_enabled = false -ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key" [http_api] -bind_address = "0.0.0.0:1212" enabled = true -ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt" -ssl_enabled = false -ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key" - -# Please override the admin token setting the -# `TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN` -# environmental variable! - -[http_api.access_tokens] -admin = "MyAccessToken" - -[health_check_api] -bind_address = "127.0.0.1:1313"