diff --git a/.gitignore b/.gitignore index 8dbc9bb..7405f99 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,6 @@ update_check.json *.exe *.dll *.crt -*.wvd -*.prd *.der *.pem *.bin @@ -21,8 +19,6 @@ device_vmp_blob unshackle/cache/ unshackle/cookies/ unshackle/certs/ -unshackle/WVDs/ -unshackle/PRDs/ temp/ logs/ Temp/ diff --git a/unshackle/unshackle.yaml b/unshackle/unshackle.yaml index df50b84..fcf871e 100644 --- a/unshackle/unshackle.yaml +++ b/unshackle/unshackle.yaml @@ -36,61 +36,31 @@ title_cache_max_retention: 86400 # Maximum cache retention for fallback when API muxing: set_title: true +# Configuration for serve +serve: + api_secret: "kenzuya" + users: + secret_key_for_user: + devices: + - generic_nexus_4464_l3 + username: user + # Login credentials for each Service credentials: - # Direct credentials (no profile support) - EXAMPLE: email@example.com:password - - # Per-profile credentials with default fallback - SERVICE_NAME: - default: default@email.com:password # Used when no -p/--profile is specified - profile1: user1@email.com:password1 - profile2: user2@email.com:password2 - - # Per-profile credentials without default (requires -p/--profile) - SERVICE_NAME2: - john: john@example.com:johnspassword - jane: jane@example.com:janespassword - - # You can also use list format for passwords with special characters - SERVICE_NAME3: - default: ["user@email.com", ":PasswordWith:Colons"] - Netflix: default: ["ariel-prinsess828@ezweb.ne.jp", "AiNe892186"] + secondary: ["csyc5478@naver.com", "wl107508!"] # default: ["pbgarena0838@gmail.com", "Andhika1978"] # Override default directories used across unshackle directories: cache: Cache - # cookies: Cookies dcsl: DCSL # Device Certificate Status List downloads: /home/kenzuya/Mounts/ketuakenzuya/Downloads/ logs: Logs temp: Temp - # wvds: WVDs - # Additional directories that can be configured: - # commands: Commands - # services: - # - /path/to/services - # - /other/path/to/services - # vaults: Vaults - # fonts: Fonts - -# Pre-define which Widevine or PlayReady device to use for each Service cdm: - # Global default CDM device (fallback for all services/profiles) - default: lg_50ut73006la.cekukh_17.0.0_22163355_7110_l1 + default: hisense_msd6a648_4.10.2891.0_2a621b99_7110_l1 - # Direct service-specific CDM - DIFFERENT_EXAMPLE: PRD_1 - - # Per-profile CDM configuration - EXAMPLE: - john_sd: chromecdm_903_l3 # Profile 'john_sd' uses Chrome CDM L3 - jane_uhd: nexus_5_l1 # Profile 'jane_uhd' uses Nexus 5 L1 - default: generic_android_l3 # Default CDM for this service - -# Use pywidevine Serve-compliant Remote CDMs remote_cdm: - name: "chromecdm" device_name: widevine @@ -127,22 +97,7 @@ key_vaults: api_mode: "decrypt_labs" host: "https://keyvault.decryptlabs.com" password: "7547150416_41da0a32d6237d83_KeyXtractor_api_ext" - # Additional vault types: - # - type: API - # name: "Remote Vault" - # uri: "https://key-vault.example.com" - # token: "secret_token" - # no_push: true # This vault will only provide keys, not receive them - # - type: MySQL - # name: "MySQL Vault" - # host: "127.0.0.1" - # port: 3306 - # database: vault - # username: user - # password: pass - # no_push: false # Default behavior - vault both provides and receives keys -# Choose what software to use to download data downloader: aria2c # Options: requests | aria2c | curl_impersonate | n_m3u8dl_re # Can also be a mapping: @@ -199,26 +154,10 @@ filenames: # API key for The Movie Database (TMDB) tmdb_api_key: "8f5c14ef648a0abdd262cf809e11fcd4" -# conversion_method: -# - auto (default): Smart routing - subby for WebVTT/SAMI, standard for others -# - subby: Always use subby with advanced processing -# - pycaption: Use only pycaption library (no SubtitleEdit, no subby) -# - subtitleedit: Prefer SubtitleEdit when available, fall back to pycaption subtitle: conversion_method: auto sdh_method: auto -# Configuration for pywidevine's serve functionality -serve: - users: - secret_key_for_user: - devices: - - generic_nexus_4464_l3 - username: user - # devices: - # - '/path/to/device.wvd' - -# Configuration data for each Service services: # Service-specific configuration goes here # Profile-specific configurations can be nested under service names @@ -251,6 +190,21 @@ services: # External proxy provider services proxy_providers: + gluetun: + base_port: 8888 + auto_cleanup: true + container_prefix: "unshackle-gluetun" + verify_ip: true + providers: + protonvpn: + vpn_type: "openvpn" + credentials: + username: "L83JaCnXKIviymQm" + password: "UewUDYdthTLLhOBJDympFFxJn4uG12BV" + server_countries: + us: United States + id: Indonesia + kr: Korea basic: SG: - "http://127.0.0.1:6004"