diff --git a/Dockerfile b/Dockerfile index a35208b..e536efd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,7 @@ MAINTAINER EstiNet ARG PORT_NUM ENV PORT_NUM ${PORT_NUM:-10150} -ARG EC_PORT_NUM -ENV EC_PORT_NUM ${EC_PORT_NUM:-9150} - -EXPOSE $EC_PORT_NUM $PORT_NUM +EXPOSE 19005 $PORT_NUM COPY . /usr/src/server WORKDIR /usr/src/server @@ -16,11 +13,8 @@ WORKDIR /usr/src/server RUN echo server-port=$PORT_NUM >> server.properties RUN echo port=$EC_PORT_NUM >> esticonsole.properties -# RUN apk add --no-cache screen - RUN mkdir /data RUN mkdir /data/logs RUN mkdir /data/plugins -# CMD screen -S -X 'java -jar EstiConsole.jar\n' -CMD exec java -jar EstiConsole.jar +CMD exec ./esticonsole diff --git a/config.json b/config.json new file mode 100644 index 0000000..cbb84d5 --- /dev/null +++ b/config.json @@ -0,0 +1,30 @@ +{ + "instance_name": "Gliders", + "instance_port": 19005, + "sslencryption": true, + "cert_file_path": "./server.crt", + "key_file_path": "./server.key", + "require_authentication": true, + "enable_root": true, + "master_key_location": "./masterkey.key", + "servers": [ + { + "instance_name": "Gliders", + "home_directory": "./", + "command_to_run": "java -Xms512M -Xmx2G -XX:+UseG1GC -XX:ParallelGCThreads=2 -XX:+AggressiveOpts -d64 -server -jar minecraft_server.jar", + "max_lines": 2000, + "amount_of_lines_to_cut_on_max": 100, + "stop_process_command": "exit", + "unresponsive_kill_time_seconds": 20, + "minecraft_mode": true, + "start_process_on_initialize": true + } + ], + "proxied_servers": [], + "users": [ + { + "name": "estinet", + "password": "EstiNetwork?123" + } + ] +} diff --git a/esticonsole b/esticonsole new file mode 100755 index 0000000..56dabc9 Binary files /dev/null and b/esticonsole differ diff --git a/plugins/gFeatures.jar b/plugins/gFeatures.jar index 382bd51..494330a 100644 Binary files a/plugins/gFeatures.jar and b/plugins/gFeatures.jar differ diff --git a/server.crt b/server.crt new file mode 100644 index 0000000..9a7078c --- /dev/null +++ b/server.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDYDCCAkigAwIBAgIJANqNuBKynfv3MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQwHhcNMTgwNTExMjM1NDM0WhcNMjgwNTA4MjM1NDM0WjBF +MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 +ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAziGJrCWVOum68baGwGLFTnSTKOY087OlynKhPyhLq9mL35RC1stkv3+k +TfHFTAoAFDxhNVHp2Ufp4fPghQizPa+bxIvPSZbfdElnBqtDHICvlrA87rffhJbU +c/armTL4SyXmktcDyzd56HXPumSQ1JwBZ2jBa+7MmThVyGodQ3gq3Ixawv1/WlQi +owWA3ERGsOAtc1WWYesUlCR4XmcVmYxhK4dm40TDJNunfSVMGvfMPR7SVfoCEUru +I6vtmh5q4Z7wGoQ00yfzwYba8BzjVu0EGxGUP5RTDEnIOlaAW6EA14IhneYn71cQ +jdzWwjbtvLPVx3Fqr0gKPyMh/NnwbQIDAQABo1MwUTAdBgNVHQ4EFgQUOYTwaVl1 +IGBdxBMQQ4iFyMSupbwwHwYDVR0jBBgwFoAUOYTwaVl1IGBdxBMQQ4iFyMSupbww +DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAUQk+r5CxGwhtrUjl +wHGPbvdn5fcZeUk4Retvw0UYgedOcgiiY0SosLkfDuoCRaeI7HhK0OSYt2vcZzhq +SiRgOxU2A/0/cRMu7043XgkgaTk8hGBi7rZaO7K9XPZziaz6pC9C3F9v+cN9deLJ +D/yGMUFTqJXZz5H8jOtB0nxRhSVMu7pzKbXXHIj8dld+UwjXzz2YRYZnNJ+phGQs +cRmG5yxjrChIeW+yU6B0WNqMowsmGpfkVIC6nPD1SDFtbSteQ6knfCyJ5jXDMlJD +l3L1QVyxqGUJNNZJBlcK0rJ7COcbecE7eUrEd8Z1gPcffGarejiXVwrw5g8dq0fd +kx3d7A== +-----END CERTIFICATE----- diff --git a/server.key b/server.key new file mode 100644 index 0000000..63bc062 --- /dev/null +++ b/server.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAziGJrCWVOum68baGwGLFTnSTKOY087OlynKhPyhLq9mL35RC +1stkv3+kTfHFTAoAFDxhNVHp2Ufp4fPghQizPa+bxIvPSZbfdElnBqtDHICvlrA8 +7rffhJbUc/armTL4SyXmktcDyzd56HXPumSQ1JwBZ2jBa+7MmThVyGodQ3gq3Ixa +wv1/WlQiowWA3ERGsOAtc1WWYesUlCR4XmcVmYxhK4dm40TDJNunfSVMGvfMPR7S +VfoCEUruI6vtmh5q4Z7wGoQ00yfzwYba8BzjVu0EGxGUP5RTDEnIOlaAW6EA14Ih +neYn71cQjdzWwjbtvLPVx3Fqr0gKPyMh/NnwbQIDAQABAoIBAQCxbjTvNTqLB32f +ahn7qAlmSvoRDnct/skKxjj+AFWCizPXM+uEsHb8T4bCgQXvOfxvbrnOB8BfA4PS +tvXgDWkcA/j06dN36KJXmodQOkL+WdbKwtDwOt3vZ1VgrEdxC2qmZO1gICxn1Ezf +R+mS69Wu7MpYlNdJbLg4e0F7zbt6wn05ayeNoYnK9qKIgngE/IiIqxOLSOJ2WaLZ +ac4M4O5xpF4o8bm+K/qexRX7nlfMlOPaF3Yv//346y/opRrRsOig1CHLe+4oxXr7 +xGi2xRoHn7KPgZ1wFyXjNj3ilK6MkqURO7Di5VghySp14FrIn0d7ZCP/krNUliE/ +/2J808KBAoGBAPJVsBCXemn6piVq8r7TlEAOhhmojrKBgUdh+hGQ0dGqK4RzEWGY +3U39sg+e97/UYDqJQzz7mGmkjkk8jXv333wWFz0KF+iYeqIjCcQ6gkK37Ei2a2jf +TBhMvSr5N0qL6WSeWe1wniYgliYOeOsZ5groZa5wO3KmN0pAgd7SJ/xVAoGBANnB +N878XayrdocIvvu5V4uci4Ez4EJKHOdNlzCf9AEtiWo/PcqM+nyQksy98C2ZU5Za +qT8GF0DaxSK3WyEGhQajnCnH86ao/Ue9GI9Q7IIaoSH+KUKVwXobU3dd+OLHFut5 +5wKANVneJAaVV3cUcGXSRiIYktcg9xe248K4mTu5AoGAdfHgjGK9cMFOhh2kYd4m +ZHrtJ6XTNew0GKMGC/CZPlt9bKx4hDDbXS8hr9qmKFZcM4FFGXQ2vQwbOGfhULnW +qtUxoEK+WjWEUk+NXFVBuuk7djRa2KL9rUIEO9sp3v1zrcYobJkIT/RCP+mBTqO/ +RAXSH3F+bZGajWgSDXnpfjUCgYBMrEAeXbYOKoGdonK859Hvkrt8TuvT64yp1SQ7 +NtcP4xzTkFkNjP5WBgHqnaaIJ8jK1Dlru5VMfLuVMcKgqk8Eu28tNv6P3EjyjZ6s +N+5PEVlTQs78ZwatHBoTmb8c+sUTPOUeeE5Qymsc9lDJ2SSKdbPEJarunOjkLL2d +vqoV4QKBgFtJvHtvRyXUX+hHpXTrX2N2RT1aPH4RSaC7XBouFjWBVJYDs06amz65 +ED/pJ2Jqwl7q9QFj1Ud8st/naSMBJlnz5HwDqk5viqa4/9qUbxx/uTDbNE99a/Jl +sSmfL26t1Psj96Pr77SYxSnhNw4UwSRaqQU6ungLxmAtFW8fNVmk +-----END RSA PRIVATE KEY-----