From d16fcb8a9d295693219a6556e7f36f3401181aa3 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sat, 4 Apr 2020 22:08:19 +0200 Subject: [PATCH] Move files managed by vmmgr to vmmgr package --- apk/spoc | 2 +- apk/vmmgr | 2 +- vm/etc/nginx/conf.d/default.conf | 61 ------------------------------ vm/etc/periodic/daily/acme.sh | 5 --- vm/etc/ssl/services.key | 28 -------------- vm/etc/ssl/services.pem | 18 --------- vm/etc/wireguard/wg0.conf.disabled | 4 -- vm/sbin/vmtty | 8 ---- 8 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 vm/etc/nginx/conf.d/default.conf delete mode 100644 vm/etc/periodic/daily/acme.sh delete mode 100644 vm/etc/ssl/services.key delete mode 100644 vm/etc/ssl/services.pem delete mode 100644 vm/etc/wireguard/wg0.conf.disabled delete mode 100755 vm/sbin/vmtty diff --git a/apk/spoc b/apk/spoc index 4e7921e..5929a1e 160000 --- a/apk/spoc +++ b/apk/spoc @@ -1 +1 @@ -Subproject commit 4e7921e85dfc7b66667ceb1d9a5da840a757a5a4 +Subproject commit 5929a1ea6b9e551965fde57e4e83b41d05b901c4 diff --git a/apk/vmmgr b/apk/vmmgr index 3b9cbe6..c220719 160000 --- a/apk/vmmgr +++ b/apk/vmmgr @@ -1 +1 @@ -Subproject commit 3b9cbe61b326d2ac829305996b6c2dd3f0e6e635 +Subproject commit c2207195ccd84f07126791c5540f0880d1cdda37 diff --git a/vm/etc/nginx/conf.d/default.conf b/vm/etc/nginx/conf.d/default.conf deleted file mode 100644 index 7bea2f9..0000000 --- a/vm/etc/nginx/conf.d/default.conf +++ /dev/null @@ -1,61 +0,0 @@ -server { - listen [::]:80 default_server ipv6only=off; - - location / { - return 301 https://$host:443$request_uri; - } - - location /.well-known/acme-challenge/ { - root /etc/acme.sh.d; - } - - location = /vm-ping { - add_header Content-Type text/plain; - return 200 "vm-pong"; - } -} - -server { - listen [::]:443 ssl http2 default_server ipv6only=off; - - location / { - proxy_pass http://127.0.0.1:8080; - } - - location /static { - root /usr/share/vmmgr; - } - - error_page 502 /502.html; - location = /502.html { - root /usr/share/vmmgr/templates; - } - - location = /vm-ping { - add_header Content-Type text/plain; - return 200 "vm-pong"; - } -} - -server { - listen [::]:443 ssl http2; - server_name ~^(.*)\.spotter\.vm$; - - location / { - return 503; - } - - location /static { - root /usr/share/vmmgr; - } - - error_page 503 /503.html; - location = /503.html { - root /usr/share/vmmgr/templates; - } - - location = /vm-ping { - add_header Content-Type text/plain; - return 200 "vm-pong"; - } -} diff --git a/vm/etc/periodic/daily/acme.sh b/vm/etc/periodic/daily/acme.sh deleted file mode 100644 index 61b9db2..0000000 --- a/vm/etc/periodic/daily/acme.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# Sleep randomly up to 1hr to avoid peak on ACME server -/bin/sleep $(/usr/bin/shuf -i 60-3600 -n 1) -/usr/bin/acme.sh --home /etc/acme.sh.d --cron >/dev/null diff --git a/vm/etc/ssl/services.key b/vm/etc/ssl/services.key deleted file mode 100644 index a0a3c15..0000000 --- a/vm/etc/ssl/services.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC20ZrpUqogm+Xf -AOJY8dl236kYaW4Gj9DrDR9cIY5xv4tkVqALPOYRypy7vN8+vtHPtO/bI1QPQ0nE -cR4dI7PPyscMlM6O0ug5Hdx+y72eR1b7RcDr3FXaQvYyz7m7duUAZVe2qPfQQf2m -/6k8IK00nAwKPQMv5saH4ZLySr0aSDtH8shVpckse2hCebUcr6+X+afH229coO1o -UwZ/Vqhx2WJJaWUkMJ9fm2pXteATigrOqBBUiPR+eSQ7+SdN9HucY6fTlkB3sP5+ -7WR550HzX/+dF+wvUG8whMRk6Im0L232K2Kao7Cj0k468l1lk8cS0X+fEXXQKi9X -xJOny8mVAgMBAAECggEBAIAqeDjk3CJaSRBK9WQ3wSYmbMyRdTIiduuiWn7jg5JZ -H6brV+4o9n44liLDqZq6eirshU8S+GZu3PNb/imdkvy1A1DdreXRFD6eoas+uKOT -DfbAkxyHbqTCVwmOOX6kPq1FXvXOhVU6PlJqX8GoguUkFQjEd0yItFwklzlHjkUy -eGYm1XmC4JX9bz/IErYqUKCtARQXhLPgbHJs5mKKxoh4l90hH3Ik0lAN2NViIluF -rla1PmGBRUtawxX33reSdMIkcs1cep6+VY5Q47KWi5/NmRYGe8hwIHlYiR8KHCn0 -BRU4skNzGqxOTrlb8rWgIPzw7i3XpocLTtBzRtwyPQECgYEA5x3WNqX6wtE5a8oC -2JaKuHzVVQtuRjHVPKBGFNXkkF6GREz2kGvFGMXz2ovOBB4cP+TCuY4tqC9AABcE -KPXuzYtuaBMx/JmyWFd4F3niXF5B/TWlJSBvmCQeF4JHOilUcpvTf12inZsUNdgT -W9n43mfVhuZ61smddgZ0urNCZEECgYEAyoCO2bTWORsbzQClEmRAIRtd54QNaMG/ -keW5dioPe4VhXj4aInJV3vRGUmd9TdVHZzVRs0wbILvf4f8bg4DzxpFqodK/2xNZ -7nTwMxxHQbeW1hIcob5hwGP61abJbsRRMdPsRnYluEykP0TGDgXs7GraNfwxY6Rm -5xvSREiggFUCgYEAo8uqmNpzaQT9TB5EfBndQLkAPKC4S7lfpfL1GCkrLwI+6EMf -b+VhL5iDpbz1ikeIv+Ox+e4A/7RVCHtHcHwz/aq22b3Y7GxFUITVUNYKDmqjHACc -BT8Ct/HI/eJP9rF57yvu7dJ/wHE7FpoHxk4qKf2vAEdyga0sEoyqx/Lpt8ECgYBI -Z8ksDJ3gU1IQbd+YAOJxNADSjAPjZgtiVlqG5qkciGd1NA1SLcGIc51FT52dG9pp -C8aHrnmwrZxyiS3ESnJfmJUhAWL6KSQpwAQ2sjDETamQJ2+3YYRALz977yPtCCLk -BxtfYlVAXZ8IxEVwtCuvqNEXJnJeZ2Un02nOYo2I9QKBgQDYfLmv0udzmB3A/HRb -7cqPLrWwDCes/YMLV2o8+94r6eiXC2490qRrK7bczkRHCl+X6g94bWppd33DC1D3 -sc/AE2d+nrAgerOLFwO5u+zyL1qXZiorLN3TTYbdi4JCRqGDAqzzVdwG8IuYbzFP -16hsShW2J94Rq0aV4qRtGFTNDw== ------END PRIVATE KEY----- diff --git a/vm/etc/ssl/services.pem b/vm/etc/ssl/services.pem deleted file mode 100644 index fa095e8..0000000 --- a/vm/etc/ssl/services.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC1DCCAbygAwIBAgIJAOqbTKW2BX0HMA0GCSqGSIb3DQEBCwUAMBUxEzARBgNV -BAMMCnNwb3R0ZXIudm0wHhcNMTgxMDI2MTIzNTI5WhcNMzgxMDI2MTIzNTI5WjAV -MRMwEQYDVQQDDApzcG90dGVyLnZtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAttGa6VKqIJvl3wDiWPHZdt+pGGluBo/Q6w0fXCGOcb+LZFagCzzmEcqc -u7zfPr7Rz7Tv2yNUD0NJxHEeHSOzz8rHDJTOjtLoOR3cfsu9nkdW+0XA69xV2kL2 -Ms+5u3blAGVXtqj30EH9pv+pPCCtNJwMCj0DL+bGh+GS8kq9Gkg7R/LIVaXJLHto -Qnm1HK+vl/mnx9tvXKDtaFMGf1aocdliSWllJDCfX5tqV7XgE4oKzqgQVIj0fnkk -O/knTfR7nGOn05ZAd7D+fu1keedB81//nRfsL1BvMITEZOiJtC9t9itimqOwo9JO -OvJdZZPHEtF/nxF10CovV8STp8vJlQIDAQABoycwJTAjBgNVHREEHDAaggpzcG90 -dGVyLnZtggwqLnNwb3R0ZXIudm0wDQYJKoZIhvcNAQELBQADggEBAEZKlh+Ds4hO -mSYx3fWv8m9tfJaEZ38B5+n6SYuyCJMB2A8CTGjDXS7tyGRvdcBFLdYF2u8YPDqI -Ra7lTLh1JNQlypROWAN/PA9JT602knF5SjupmlGMTTHtUQgna+geBnw3V3e+IMwS -l6m3vSsndE+OFBmNfk2bbA3b7XS0T44PNYOBt1feyPKJ8TVGApakFL3cF1TMMQbq -od2lEDxiqmAPmJlyPGJyOSGTT3i12TenDBKhFRTyy7kmu2I+dDO0yPCSfonMTsr3 -liTAEJHE8xfjd6wygdYU2JWdx8KRCK2RfbDqZ9B11MKY2a3J4M289etJ7hyp6IMt -3iJrD0XG1bE= ------END CERTIFICATE----- diff --git a/vm/etc/wireguard/wg0.conf.disabled b/vm/etc/wireguard/wg0.conf.disabled deleted file mode 100644 index b080081..0000000 --- a/vm/etc/wireguard/wg0.conf.disabled +++ /dev/null @@ -1,4 +0,0 @@ -[Interface] -ListenPort = 51820 -PrivateKey = None - diff --git a/vm/sbin/vmtty b/vm/sbin/vmtty deleted file mode 100755 index 5f476f1..0000000 --- a/vm/sbin/vmtty +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Rebuild /etc/issue -/usr/bin/vmmgr rebuild-issue -# Print /etc/issue -/bin/cat /etc/issue -# Wait for key press -read a