diff --git a/host_vars/fileserver3.mgrote.net.yml b/host_vars/fileserver3.mgrote.net.yml index 7657941e..7f0e3ccb 100644 --- a/host_vars/fileserver3.mgrote.net.yml +++ b/host_vars/fileserver3.mgrote.net.yml @@ -32,8 +32,6 @@ ytdl_enable_podcast_download: false ytdl_podcast_output: "/shares_music/Podcasts/%(playlist)s/%(id)s.%(ext)s" ytdl_video_log_output: "/shares_videos/Youtube/archive-youtube.log" ytdl_podcast_log_output: "/shares_music/Podcasts/archive-podcast.log" -ytdl_youtube_username: "{{ lookup('viczem.keepass.keepass', 'youtubedl_youtube_login', 'username') }}" -ytdl_youtube_password: "{{ lookup('viczem.keepass.keepass', 'youtubedl_youtube_login', 'password') }}" ytdl_conf_dir: "/etc/youtubedl" # ohne / am ende ytdl_download_limit: "10000K" diff --git a/keepass_db.kdbx b/keepass_db.kdbx index 23105167..a737a4f0 100644 Binary files a/keepass_db.kdbx and b/keepass_db.kdbx differ diff --git a/roles/mgrote_youtubedl/defaults/main.yml b/roles/mgrote_youtubedl/defaults/main.yml index 993e6fe7..6bde759f 100644 --- a/roles/mgrote_youtubedl/defaults/main.yml +++ b/roles/mgrote_youtubedl/defaults/main.yml @@ -30,8 +30,6 @@ ytdl_video_output: "/shares_videos/Youtube/%(uploader)s/%(title)s-%(id)s.%(ext)s ytdl_podcast_output: "/shares_music/Podcasts/%(playlist)s/%(id)s.%(ext)s" ytdl_video_log_output: "/shares_videos/Youtube/archive-youtube.log" ytdl_podcast_log_output: "/shares_music/Podcasts/archive-podcast.log" -ytdl_youtube_username: "{{ lookup('viczem.keepass.keepass', 'youtubedl_youtube_login', 'username') }}" -ytdl_youtube_password: "{{ lookup('viczem.keepass.keepass', 'youtubedl_youtube_login', 'password') }}" ytdl_conf_dir: "/etc/youtubedl" #ohne / am ende ytdl_download_limit: "10000K" ytdl_active: false # damit werden die systemd-Units nicht angelegt diff --git a/roles/mgrote_youtubedl/templates/youtube.txt b/roles/mgrote_youtubedl/templates/youtube.txt index 5a452fb8..a6efd748 100644 --- a/roles/mgrote_youtubedl/templates/youtube.txt +++ b/roles/mgrote_youtubedl/templates/youtube.txt @@ -15,8 +15,7 @@ --write-info-json #schreibe metadaten --write-description #schreibe metadaten --write-annotations #schreibe metadaten ---username "{{ lookup('viczem.keepass.keepass', 'youtubedl_youtube_login', 'username') }}" #login youtube ---password "{{ lookup('viczem.keepass.keepass', 'youtubedl_youtube_login', 'password') }}" #login youtube +--username oauth --no-color --no-progress