From 42141cbe898b10efe179fc08d272c2c949bf0164 Mon Sep 17 00:00:00 2001 From: Saswat Padhi Date: Thu, 18 Jul 2024 15:44:09 -0700 Subject: [PATCH] minor fixes --- .github/workflows/compose-test_airdcpp.yml | 3 +- .github/workflows/compose-test_gitea.yml | 2 +- .github/workflows/compose-test_hass.yml | 2 +- .github/workflows/compose-test_indexarr.yml | 2 +- .github/workflows/compose-test_monitarr.yml | 2 +- .github/workflows/compose-test_navidrome.yml | 2 +- .github/workflows/compose-test_nextcloud.yml | 2 +- .github/workflows/compose-test_nocodb.yml | 2 +- .github/workflows/compose-test_pihole.yml | 2 +- .../workflows/compose-test_qbittorrent.yml | 2 +- .github/workflows/compose-test_tang.yml | 2 +- .github/workflows/compose-test_teslamate.yml | 2 +- .github/workflows/config/vpn/client.conf | 2 +- .github/workflows/config/vpn_alt/client.conf | 63 ++++++++++--------- 14 files changed, 47 insertions(+), 43 deletions(-) diff --git a/.github/workflows/compose-test_airdcpp.yml b/.github/workflows/compose-test_airdcpp.yml index 4b93a65..27c3f43 100644 --- a/.github/workflows/compose-test_airdcpp.yml +++ b/.github/workflows/compose-test_airdcpp.yml @@ -54,11 +54,12 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs exit 1 fi + cd traefik docker-compose exec -T traefik wget --spider --no-check-certificate --header "Accept: text/html" https://127.0.0.1/airdcpp/ \ || (docker ps ; docker-compose logs ; cd ../airdcpp ; docker-compose logs ; exit 1) diff --git a/.github/workflows/compose-test_gitea.yml b/.github/workflows/compose-test_gitea.yml index 55e35ed..78d4ead 100644 --- a/.github/workflows/compose-test_gitea.yml +++ b/.github/workflows/compose-test_gitea.yml @@ -52,7 +52,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_hass.yml b/.github/workflows/compose-test_hass.yml index a7f1483..ed48134 100644 --- a/.github/workflows/compose-test_hass.yml +++ b/.github/workflows/compose-test_hass.yml @@ -51,7 +51,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_indexarr.yml b/.github/workflows/compose-test_indexarr.yml index 784e8ed..e719aea 100644 --- a/.github/workflows/compose-test_indexarr.yml +++ b/.github/workflows/compose-test_indexarr.yml @@ -54,7 +54,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_monitarr.yml b/.github/workflows/compose-test_monitarr.yml index c177cba..cedce06 100644 --- a/.github/workflows/compose-test_monitarr.yml +++ b/.github/workflows/compose-test_monitarr.yml @@ -52,7 +52,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_navidrome.yml b/.github/workflows/compose-test_navidrome.yml index f921edf..4454f53 100644 --- a/.github/workflows/compose-test_navidrome.yml +++ b/.github/workflows/compose-test_navidrome.yml @@ -52,7 +52,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_nextcloud.yml b/.github/workflows/compose-test_nextcloud.yml index a4f78d9..6beae2d 100644 --- a/.github/workflows/compose-test_nextcloud.yml +++ b/.github/workflows/compose-test_nextcloud.yml @@ -52,7 +52,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_nocodb.yml b/.github/workflows/compose-test_nocodb.yml index 9e3d432..65b22ec 100644 --- a/.github/workflows/compose-test_nocodb.yml +++ b/.github/workflows/compose-test_nocodb.yml @@ -52,7 +52,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_pihole.yml b/.github/workflows/compose-test_pihole.yml index fc4a5ca..b262c86 100644 --- a/.github/workflows/compose-test_pihole.yml +++ b/.github/workflows/compose-test_pihole.yml @@ -52,7 +52,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_qbittorrent.yml b/.github/workflows/compose-test_qbittorrent.yml index 26e3ddf..5f638dc 100644 --- a/.github/workflows/compose-test_qbittorrent.yml +++ b/.github/workflows/compose-test_qbittorrent.yml @@ -54,7 +54,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_tang.yml b/.github/workflows/compose-test_tang.yml index b724ce8..47a09c9 100644 --- a/.github/workflows/compose-test_tang.yml +++ b/.github/workflows/compose-test_tang.yml @@ -52,7 +52,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/compose-test_teslamate.yml b/.github/workflows/compose-test_teslamate.yml index 5ca8ec7..9985ce9 100644 --- a/.github/workflows/compose-test_teslamate.yml +++ b/.github/workflows/compose-test_teslamate.yml @@ -52,7 +52,7 @@ jobs: - name: "Service: Test with Traefik" run: | - if ! ./compositions.sh check ${TARGET_SERVICE} traefik; then + if ! ./compositions.sh check ${TARGET_SERVICE} ; then docker ps cd ${TARGET_SERVICE} ; docker-compose logs cd traefik ; docker-compose logs diff --git a/.github/workflows/config/vpn/client.conf b/.github/workflows/config/vpn/client.conf index 3e12f67..d0b5949 100644 --- a/.github/workflows/config/vpn/client.conf +++ b/.github/workflows/config/vpn/client.conf @@ -59,7 +59,7 @@ proto tcp # When you use UDP protocol, the port number must same as the configuration # setting of "OpenVPN Server Compatible Function" on the VPN Server. -remote 219.100.37.96 443 +remote public-vpn-152.opengw.net 443 ############################################################################### diff --git a/.github/workflows/config/vpn_alt/client.conf b/.github/workflows/config/vpn_alt/client.conf index c896a8c..3ea218a 100644 --- a/.github/workflows/config/vpn_alt/client.conf +++ b/.github/workflows/config/vpn_alt/client.conf @@ -59,7 +59,7 @@ proto tcp # When you use UDP protocol, the port number must same as the configuration # setting of "OpenVPN Server Compatible Function" on the VPN Server. -remote 219.100.37.2 443 +remote public-vpn-38.opengw.net 443 ############################################################################### @@ -113,35 +113,38 @@ auth-user-pass login.txt -----BEGIN CERTIFICATE----- -MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4 -WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu -ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY -MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc -h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+ -0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U -A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW -T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH -B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC -B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv -KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn -OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn -jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw -qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI -rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV -HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq -hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL -ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ -3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK -NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5 -ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur -TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC -jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc -oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq -4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA -mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d -emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc= +MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB +iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl +cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV +BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw +MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV +BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU +aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy +dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK +AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B +3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY +tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/ +Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2 +VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT +79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6 +c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT +Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l +c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee +UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE +Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd +BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G +A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF +Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO +VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3 +ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs +8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR +iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze +Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ +XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/ +qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB +VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB +L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG +jjxDah2nGN59PRbxYvnKkKj9 -----END CERTIFICATE-----