Merge branch 'master' of https://github.com/moecube/srvpro

Dockerfile

+FROM node:stretch
+
+RUN ssh-keygen -A
+RUN apt update
+RUN apt install -y openssh-server locales curl git vim build-essential premake4 libevent-dev libsqlite3-dev liblua5.3-dev mono-complete sqlite3 p7zip-full
+RUN ln -s /usr/lib/x86_64-linux-gnu/liblua5.3.so /usr/lib/liblua.so
+RUN npm install pm2 -g
+
+# 系统源
+#RUN sed -i 's/deb.debian.org/ftp.cn.debian.org/g' /etc/apt/sources.list
+#RUN apt update
+
+# ssh
+RUN mkdir -p /var/run/sshd
+RUN mkdir /root/.ssh
+RUN echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config
+
+# locale
+RUN echo "zh_CN.UTF-8 UTF-8" > /etc/locale.gen && \
+    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+    locale-gen && \
+    dpkg-reconfigure -f noninteractive locales tzdata && \
+    /usr/sbin/update-locale LANG=zh_CN.UTF-8
+ENV LANG=zh_CN.UTF-8
+
+# declarations
+EXPOSE 22
+EXPOSE 7911
+EXPOSE 7922
+VOLUME /root
+
+WORKDIR /root
+COPY data/entrypoint.sh /entrypoint.sh
+CMD [ "/entrypoint.sh" ]

data/entrypoint.sh

+#!/bin/bash
+
+if [ -n "$authorized_keys" ] && [ ! -f /root/.ssh/authorized_keys ]; then printenv authorized_keys > /root/.ssh/authorized_keys; fi
+if [ -n "$password" ] && passwd --status | grep -q 'L'; then echo "root:$password" | chpasswd ; fi
+unset authorized_keys
+unset password
+/usr/sbin/sshd -D

data/i18n.json

@@ -146,7 +146,7 @@
     "deck_incorrect_reconnect": "Please pick your previous deck.",
     "reconnect_failed": "Reconnect failed.",
     "reconnecting_to_room": "Reconnecting to server...",
-    "reconnect_kicked": "You are kicked out because you're logined in on other devices.",
+    "reconnect_kicked": "You are kicked out because you're logged in on other devices.",
     "challonge_user_not_found": "You are not a participant of the tournament.",
     "challonge_match_load_failed": "Failed loading tournament info.",
     "challonge_match_not_found": "Your current match was not found.",
@@ -312,6 +312,13 @@
     "deck_incorrect_reconnect": "Por favor, escoja tu Deck anterior.",
     "reconnect_failed": "Fallo al reconectar.",
     "reconnecting_to_room": "Reconectando al servidor...",
+    "reconnect_kicked": "Fuiste expulsado porque estás conectado a otros dispositivos.",
+    "challonge_user_not_found": "No eres participante del torneo.",
+    "challonge_match_load_failed": "Fallo al cargar información del torneo.",
+    "challonge_match_not_found": "No se pudo encontrar tu partida.",
+    "challonge_match_already_finished": "Tu partida actual ya ha terminado. Por favor, llama a un juez para ayuda.",
+    "challonge_match_created": "Una sala de sólo partidas creada. Tu oponente se unirá automáticamente.",
+    "challonge_player_already_in": "Por favor, no entres en la sala en la que ya estás.",
     "athletic_arena_tip": "Durante una Partdida deportiva, un comportamiento de abandono se considera una rendición."
   },
   "zh-cn": {