diff --git a/LICENSE b/LICENSE index 826701c..d59651b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2022 Alexander "Arav" Andreev +Copyright (c) 2022,2023 Alexander "Arav" Andreev Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/build/archlinux/PKGBUILD b/build/archlinux/PKGBUILD index 22492b1..6fcd5af 100644 --- a/build/archlinux/PKGBUILD +++ b/build/archlinux/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer: Alexander "Arav" Andreev +# Maintainer: Alexander "Arav" Andreev pkgname=dwelling-radio pkgver=23.7.0 pkgrel=1 pkgdesc="Arav's dwelling / Radio" arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') -url="https://git.arav.top/Arav/dwelling-radio" +url="https://git.arav.su/Arav/dwelling-radio" license=('MIT') groups=() depends=() @@ -15,7 +15,7 @@ replaces=() backup=('etc/dwelling/radio.yaml' 'etc/dwelling/radio.vars.liq') options=() install= -source=('https://git.arav.top/Arav/dwelling-radio/archive/23.7.0.tar.gz') +source=('https://git.arav.su/Arav/dwelling-radio/archive/23.7.0.tar.gz') noextract=() md5sums=('SKIP') diff --git a/cmd/dwelling-radio/main.go b/cmd/dwelling-radio/main.go index 7b069e7..3102f40 100644 --- a/cmd/dwelling-radio/main.go +++ b/cmd/dwelling-radio/main.go @@ -23,7 +23,7 @@ func main() { flag.Parse() if *showVersion { - fmt.Println("dwelling-radio ver.", version, "\nCopyright (c) 2022,2023 Alexander \"Arav\" Andreev ") + fmt.Println("dwelling-radio ver.", version, "\nCopyright (c) 2022,2023 Alexander \"Arav\" Andreev ") return } diff --git a/configs/nginx.conf b/configs/nginx.conf index 4343c8f..b18ee46 100644 --- a/configs/nginx.conf +++ b/configs/nginx.conf @@ -4,12 +4,12 @@ server { listen 127.0.0.1:8111; # I2P listen [300:a98d:d6d0:8a08::e]:80; # Yggdrasil - server_name radio.arav.top radio.arav.i2p mkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion; + server_name radio.arav.su radio.arav.i2p mkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion; access_log /var/log/nginx/dwelling/radio.log main if=$nolog; - ssl_certificate /etc/letsencrypt/live/arav.top/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/arav.top/privkey.pem; + ssl_certificate /etc/letsencrypt/live/arav.su/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/arav.su/privkey.pem; add_header Content-Security-Policy "default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self'; media-src 'self'; object-src 'none'; frame-src 'none'; frame-ancestors 'none'; font-src 'self'; form-action 'none'"; add_header X-Frame-Options "DENY"; @@ -40,7 +40,7 @@ server { server { listen 8000; - server_name radio.arav.top; + server_name radio.arav.su; access_log /var/log/nginx/dwelling/radio.http.log main if=$nolog; diff --git a/configs/radio.vars.liq b/configs/radio.vars.liq index 67a4fd3..8b32f10 100644 --- a/configs/radio.vars.liq +++ b/configs/radio.vars.liq @@ -2,7 +2,7 @@ log_file_path = "/var/log/dwelling-radio/liquidsoap.log" -radio_url = "https://radio.arav.top" +radio_url = "https://radio.arav.su" radio_name = "Arav's dwelling / Radio" radio_desc = "Broadcasting from under my desk." diff --git a/internal/http/handlers.go b/internal/http/handlers.go index 5fecf1b..5ecfd04 100644 --- a/internal/http/handlers.go +++ b/internal/http/handlers.go @@ -95,8 +95,8 @@ func (h *Handlers) LastSong(w http.ResponseWriter, r *http.Request) { } func (h *Handlers) Playlist(w http.ResponseWriter, _ *http.Request) { - w.Header().Add("Content-Disposition", "attachment; filename=\"radio.arav.top.m3u\"") - fc, _ := web.AssetsGetFile("radio.arav.top.m3u") + w.Header().Add("Content-Disposition", "attachment; filename=\"radio.arav.su.m3u\"") + fc, _ := web.AssetsGetFile("radio.arav.su.m3u") w.Write(fc) } diff --git a/pkg/utils/dwelling.go b/pkg/utils/dwelling.go index ecdd4a9..f524790 100644 --- a/pkg/utils/dwelling.go +++ b/pkg/utils/dwelling.go @@ -16,7 +16,7 @@ func MainSite(host string) string { return "http://[300:a98d:d6d0:8a08::f]" } - return "https://arav.top" + return "https://arav.su" } // ToClientTimezone converts given time to timezone set in a diff --git a/web/assets/radio.arav.top.m3u b/web/assets/radio.arav.top.m3u index b726053..281db7e 100644 --- a/web/assets/radio.arav.top.m3u +++ b/web/assets/radio.arav.top.m3u @@ -1,8 +1,8 @@ #EXTM3U #EXTINF:-1,Arav's dwelling / Radio -http://radio.arav.top:8000/stream.ogg +http://radio.arav.su:8000/stream.ogg #EXTINF:-1,Arav's dwelling / Radio (HTTPS) -https://radio.arav.top/live/stream.ogg +https://radio.arav.su/live/stream.ogg #EXTINF:-1,Arav's dwelling / Radio on Tor http://wsmkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion/live/stream.ogg #EXTINF:-1,Arav's dwelling / Radio on I2P diff --git a/web/templates/index.pug b/web/templates/index.pug index 4f78a56..0694008 100644 --- a/web/templates/index.pug +++ b/web/templates/index.pug @@ -27,7 +27,7 @@ html(lang='en') a(href='/filelist') filelist a(href='/playlist') playlist (.m3u) a(href='/live/stream.ogg') direct link - a(href='http://radio.arav.top:8000/stream.ogg') direct link (http) + a(href='http://radio.arav.su:8000/stream.ogg') direct link (http) a(href='http://wsmkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion/live/stream.ogg') direct link (Tor) a(href='http://radio.arav.i2p/live/stream.ogg') direct link (I2P) a(href="https://dir.xiph.org/search?q=arav's+dwelling") Xiph @@ -60,4 +60,4 @@ html(lang='en') h2 Privacy statements p Logs are collected and include access date and time, IP-address, User-Agent, referer URL, request. This website makes use of JavaScript to update a radio status and last 10 songs list. footer - | 2017—2023 Arav <#[a(href='mailto:me@arav.top') me@arav.top]> + | 2017—2023 Arav <#[a(href='mailto:me@arav.su') me@arav.su]>