diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index 6b34450a..bf381a90 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -35,7 +35,6 @@ var wtvnewsserver = null; - process .on('SIGTERM', shutdown('SIGTERM')) .on('SIGINT', shutdown('SIGINT')) diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/https/wildcard.crt b/zefie_wtvp_minisrv/includes/ServiceDeps/https/wildcard.crt new file mode 100644 index 00000000..3b25e320 --- /dev/null +++ b/zefie_wtvp_minisrv/includes/ServiceDeps/https/wildcard.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDHDCCAgSgAwIBAgIJANgyJZChbVqvMA0GCSqGSIb3DQEBBQUAMEQxHDAaBgNV +BAMME1NTTHYzIFdlYlRWIG1pbmlzcnYxFzAVBgNVBAoMDlplZmllIE5ldHdvcmtz +MQswCQYDVQQGEwJVUzAgFw0yNTA3MjExNDUxMzVaGA8yMTI1MDYyNzE0NTEzNVow +KzEKMAgGA1UEAwwBKjEQMA4GA1UECgwHbWluaXNydjELMAkGA1UEBhMCVVMwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClQxALy0JUObUUaCMcVXCWzldb +DCmdY2J/9ByGft9L9cO2dytyLfYr3oQ3KdxIkYSFP4Ix7ZlQaE7ELmZTmtZF6IXW +BWTeTmyCHbpsF2QZbaiCsNrG6MlOdMCw2p8vQi3C1v4fLdn4PPVdEFTijCETBh1o +Qf8q8PtnnFgW6NTb4siGDbzjpn0faxp1hMGNdqwpL0GAy4SScvYWw1gccetXp7KH +ZnMZzKNS/FH/jtQwYjXNYMX52t7j06KINT5MZtEY/VzHfYDTfsXx2EvXbwQ2e16C +f1CnXBpiyKRHx1zODIZ/N2IFlhnQ+XB4SjSPjVCByPGml81NMeSVa0HwxeDtAgMB +AAGjKDAmMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMAwGA1UdEQQFMAOCASowDQYJ +KoZIhvcNAQEFBQADggEBAHxPq0PCv5zZl+mjPwACEVt4Ou+Hct8s5cxCVNcOZ9cI +f8ovpC4a+ELBymNKskZn2sgSMTV43aG3RntB4aB/J3GnYMon5RF6fpE2FdujzL3T +Ftk/vwgQf/R6j6YMceOz0H/V5J9zWUUVm/Ck+lhJlbMJQ3pkWQR3cxXqrFomrpbi +hWiYiUQG3eChPMFK/qVMtuApsl2Mq28JkvjZF8rpzoQNz0PoQOMRaWbNaPLh9+lR +rTA350faSRNZWFvp9t2Ctn5Ox9gdsMVwBGRqiEt4mqzOj2+jJdSYTK1oyL3WgFUI +BDz62wFzTBVRLafRDBLSKdtz8oBe57o106jJM/F2lGc= +-----END CERTIFICATE----- diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/https/wildcard.key b/zefie_wtvp_minisrv/includes/ServiceDeps/https/wildcard.key new file mode 100644 index 00000000..6bc24889 --- /dev/null +++ b/zefie_wtvp_minisrv/includes/ServiceDeps/https/wildcard.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQClQxALy0JUObUU +aCMcVXCWzldbDCmdY2J/9ByGft9L9cO2dytyLfYr3oQ3KdxIkYSFP4Ix7ZlQaE7E +LmZTmtZF6IXWBWTeTmyCHbpsF2QZbaiCsNrG6MlOdMCw2p8vQi3C1v4fLdn4PPVd +EFTijCETBh1oQf8q8PtnnFgW6NTb4siGDbzjpn0faxp1hMGNdqwpL0GAy4SScvYW +w1gccetXp7KHZnMZzKNS/FH/jtQwYjXNYMX52t7j06KINT5MZtEY/VzHfYDTfsXx +2EvXbwQ2e16Cf1CnXBpiyKRHx1zODIZ/N2IFlhnQ+XB4SjSPjVCByPGml81NMeSV +a0HwxeDtAgMBAAECggEAZakiZs7rh5pULTB+YMCiWPKnxCdwNhRcFHAbWBUV0clm +UoluXXeuln/0f2atzqpNhhZyRbpudIsl4QLWCZoXM7v9EJIS4boGf+g/tJyTBB1z +6qlWe8PZifzCSEjEYbLpKZFNk+qFynHdUhlozk/7TJOXZXoruMOzM6J2gelKf9Q+ +CjTfp59CQXvhzOtHSSSpTLP1hjIuppbxIXNCklutaCLlE7iEuAMA+TplhGeLemMG +IvpkfSATQ1FFZ52Qxk9qagRPaOis73iqNnPb5M6vaDHed6WLx3UXFdf2dsINd7ar +IcPUl+Al/2noL7C/aObugDmncwKmuDd4Eheo2TXN1QKBgQDPm52gtKdp5+43QIOn +bAWegGkcUIur/LmbAy2eibMbc9haeNFaXxMzmZoHqw61Lfj8rzhr8x/M2Q3fT5Nw +wXcza84g2EOxIR/42BFoF9LzJMREDBnaMbohqGMObwJSltzH+MJyI4VcP8x9T67E +H/Au8wRBEiBsopUKUC9JYIn/FwKBgQDLyJSPWAsVa/0cdBjratquxN1fQhhBOlTH +rY6ZnbqxQjngX+2rfLFqngacWq26P4bKrb8l+nv/965Yd0GAtWWu4Do+B1ExZzbe +OdMrF8AOnM3DJZRzMhHRIuX68mA9GXyZZODVeA3LftMgF/77J2Fk5fwIMwTH7k8M ++LmS/v/CmwKBgGeFOjFTQ5N8kf09DyjhpV+mukLjKvJEn6xbBlliYkwTFNPwILxG +YkW9lt+x/TB8zwX4vVKetcGojdFHVcbIwY6DeBJKpF5jnRSxcOSN1KNnNvKTciSp +3R1BYLtmwSq7jTWtpg/SBIK+UVI+9G9ZWaOfjASCbGafH2A4IYweNlFbAoGAO3Y8 +uxLysP6ArbPGrbLROpvhCHGtyCKwKE+hQ3u9xQlRAAKdxCMvVa/kt+zRsn3k4/EM +zJUpZ4grDE9IArlrgTqWZBEYhPTcEr4GuxVECj+A3sdxaKecgUzQlIfywwFT1SKV +ZFSSmeVYz42Q7lIQXjOpde8FHx2PXXaaF6Vmla8CgYAKNQK0U2kMql8VxS1vLRYD +esGk/9UWK+ADLsz5FigLBl3+nVion4CKCsH2LLCAR6oIOwUU0GmPXJEB0LsK3AFc ++ahbqSGwubB2XIjmPqoveaMEy0sONvNA+eFq+0nLZTz8fNk7coXlHGPnxeXaUEg2 +NCflP0Ps893hDTrd9JxcBg== +-----END PRIVATE KEY----- diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/download-ssl-certs.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/download-ssl-certs.js index 0b495a99..6b20a9ec 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/download-ssl-certs.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/download-ssl-certs.js @@ -1,4 +1,5 @@ header = `200 OK Content-type: wtv/ssl-certs` +const wtvssl = new WTVSSL(); data = wtvssl.getCACert(); \ No newline at end of file diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js index f120b035..e97d49cf 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js @@ -186,7 +186,7 @@ wtv-inactive-timeout: 1440 headers += `wtv-force-lightweight-targets: webtv.net:/ wtv-show-time-enabled: true wtv-allow-dsc: true -wtv-tourist-enabled: true +wtv-tourist-enabled: false wtv-offline-mail-enable: false wtv-demo-mode: 0 wtv-wink-deferrer-retries: 3 diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json index 71aa59d9..88c5c73b 100644 --- a/zefie_wtvp_minisrv/includes/config.json +++ b/zefie_wtvp_minisrv/includes/config.json @@ -171,7 +171,10 @@ // wtv-head-waiter handles logins "port": 1601, "connections": 1, - "privileged": true + "privileged": true, + "modules": [ + "WTVSSL" + ] }, "wtv-tricks": { // wtv-tricks