From 4f2829353eb742064a4c6fe64ecb47076acf7e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Fri, 18 Aug 2023 15:31:19 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=AE=89=E8=A3=85=E5=92=8C=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=BF=87=E7=A8=8B=E4=B8=AD=E6=8F=90=E7=A4=BA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=85=8D=E7=BD=AE=20domains?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/en/LC_MESSAGES/jumpserver-installer.po | 407 ++++++++-------- .../zh_CN/LC_MESSAGES/jumpserver-installer.mo | Bin 10461 -> 10583 bytes .../zh_CN/LC_MESSAGES/jumpserver-installer.po | 455 +++++++++--------- scripts/1_config_jumpserver.sh | 18 +- scripts/4_install_jumpserver.sh | 12 +- scripts/7_upgrade.sh | 13 + scripts/utils.sh | 10 + 7 files changed, 477 insertions(+), 438 deletions(-) diff --git a/locale/en/LC_MESSAGES/jumpserver-installer.po b/locale/en/LC_MESSAGES/jumpserver-installer.po index 3db5eb5c..dd0c0be2 100644 --- a/locale/en/LC_MESSAGES/jumpserver-installer.po +++ b/locale/en/LC_MESSAGES/jumpserver-installer.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-28 04:49+0000\n" +"POT-Creation-Date: 2023-08-18 07:21+0000\n" "PO-Revision-Date: 2021-01-21 19:15+0800\n" "Last-Translator: Bai \n" "Language-Team: Language locale/en/LC\n" @@ -16,70 +16,108 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: scripts/6_db_restore.sh:16 -msgid "Start restoring database" +#: jmsctl.sh:15 +msgid "Configuration file not found" msgstr "" -#: scripts/6_db_restore.sh:20 -msgid "file does not exist" +#: jmsctl.sh:16 +msgid "If you are upgrading from v1.5.x, please copy the config.txt To" msgstr "" -#: scripts/6_db_restore.sh:32 -msgid "" -"Database recovery failed. Please check whether the database file is complete " -"or try to recover manually" +#: jmsctl.sh:21 +msgid "There is a problem with the soft connection, Please update it again" msgstr "" -#: scripts/6_db_restore.sh:35 -msgid "Database recovered successfully" +#: jmsctl.sh:40 +msgid "JumpServer Deployment Management Script" msgstr "" -#: scripts/6_db_restore.sh:46 -msgid "Format error" +#: jmsctl.sh:47 +msgid "Install JumpServer" msgstr "" -#: scripts/6_db_restore.sh:50 -msgid "The backup file does not exist" +#: jmsctl.sh:48 +msgid "Upgrade JumpServer" msgstr "" -#: scripts/2_install_docker.sh:22 -msgid "Docker program does not exist" +#: jmsctl.sh:49 +msgid "Check for updates JumpServer" msgstr "" -#: scripts/2_install_docker.sh:127 -msgid "Do you want to support IPv6" +#: jmsctl.sh:50 +msgid "Reconfiguration JumpServer" msgstr "" -#: scripts/2_install_docker.sh:173 -msgid "Install Docker" +#: jmsctl.sh:53 +msgid "Start JumpServer" msgstr "" -#: scripts/2_install_docker.sh:176 -msgid "Configure Docker" +#: jmsctl.sh:54 +msgid "Stop JumpServer" msgstr "" -#: scripts/2_install_docker.sh:178 -msgid "Start Docker" +#: jmsctl.sh:55 +msgid "Close JumpServer" msgstr "" -#: scripts/3_load_images.sh:20 -msgid "Docker image not found" +#: jmsctl.sh:56 +msgid "Restart JumpServer" msgstr "" -#: scripts/3_load_images.sh:38 -msgid "Docker image loaded, skipping" +#: jmsctl.sh:57 +msgid "Check JumpServer" msgstr "" -#: scripts/5_db_backup.sh:22 -msgid "Backing up" +#: jmsctl.sh:58 +msgid "Offline JumpServer" msgstr "" -#: scripts/5_db_backup.sh:33 -msgid "Backup failed" +#: jmsctl.sh:59 scripts/8_uninstall.sh:63 +msgid "Uninstall JumpServer" msgstr "" -#: scripts/5_db_backup.sh:37 -msgid "Backup succeeded! The backup file has been saved to" +#: jmsctl.sh:62 +msgid "Loading docker image" +msgstr "" + +#: jmsctl.sh:63 scripts/7_upgrade.sh:298 +msgid "Backup database" +msgstr "" + +#: jmsctl.sh:64 +msgid "Data recovery through database backup file" +msgstr "" + +#: jmsctl.sh:65 +msgid "Execute the original docker-compose command" +msgstr "" + +#: jmsctl.sh:66 +msgid "View log" +msgstr "" + +#: jmsctl.sh:127 +msgid "The current version is up to date" +msgstr "" + +#: jmsctl.sh:132 +msgid "The latest version is" +msgstr "" + +#: jmsctl.sh:136 +msgid "The current version is" +msgstr "" + +#: jmsctl.sh:181 jmsctl.sh:187 +msgid "Unsupported Operating System Error" +msgstr "" + +#: jmsctl.sh:182 +msgid "macOS installer please see" +msgstr "" + +#: jmsctl.sh:188 +msgid "Windows installer please see" msgstr "" #: scripts/4_install_jumpserver.sh:10 @@ -98,194 +136,214 @@ msgstr "" msgid "The Installation is Complete" msgstr "" -#: scripts/4_install_jumpserver.sh:30 +#: scripts/4_install_jumpserver.sh:37 msgid "You can use the following command to start, and then visit" msgstr "" -#: scripts/4_install_jumpserver.sh:34 +#: scripts/4_install_jumpserver.sh:41 msgid "Other management commands" msgstr "" -#: scripts/4_install_jumpserver.sh:39 +#: scripts/4_install_jumpserver.sh:46 msgid "For more commands, you can enter ./jmsctl.sh --help to understand" msgstr "" -#: scripts/4_install_jumpserver.sh:41 +#: scripts/4_install_jumpserver.sh:48 msgid "Web access" msgstr "" -#: scripts/4_install_jumpserver.sh:48 +#: scripts/4_install_jumpserver.sh:55 msgid "Default username" msgstr "" -#: scripts/4_install_jumpserver.sh:48 +#: scripts/4_install_jumpserver.sh:55 msgid "Default password" msgstr "" -#: scripts/4_install_jumpserver.sh:50 +#: scripts/4_install_jumpserver.sh:57 msgid "access" msgstr "" -#: scripts/4_install_jumpserver.sh:54 +#: scripts/4_install_jumpserver.sh:61 msgid "More information" msgstr "" -#: scripts/4_install_jumpserver.sh:55 +#: scripts/4_install_jumpserver.sh:62 msgid "Official Website" msgstr "" -#: scripts/4_install_jumpserver.sh:56 +#: scripts/4_install_jumpserver.sh:63 msgid "Documentation" msgstr "" -#: scripts/4_install_jumpserver.sh:65 +#: scripts/4_install_jumpserver.sh:73 msgid "Install and Configure Docker" msgstr "" -#: scripts/4_install_jumpserver.sh:69 scripts/7_upgrade.sh:245 +#: scripts/4_install_jumpserver.sh:77 scripts/7_upgrade.sh:295 msgid "Loading Docker Image" msgstr "" -#: scripts/4_install_jumpserver.sh:73 +#: scripts/4_install_jumpserver.sh:81 msgid "Install and Configure JumpServer" msgstr "" -#: scripts/7_upgrade.sh:137 +#: scripts/7_upgrade.sh:92 scripts/1_config_jumpserver.sh:158 +msgid "Please enter the access IP or domain name of JumpServer" +msgstr "" + +#: scripts/7_upgrade.sh:186 msgid "Back up to" msgstr "" -#: scripts/7_upgrade.sh:144 +#: scripts/7_upgrade.sh:193 msgid "Failed to backup the database. Continue to upgrade" msgstr "" -#: scripts/7_upgrade.sh:150 +#: scripts/7_upgrade.sh:199 msgid "Skip database backup" msgstr "" -#: scripts/7_upgrade.sh:157 +#: scripts/7_upgrade.sh:206 msgid "" "Detected that the JumpServer container is running. Do you want to close the " "container and continue to upgrade" msgstr "" -#: scripts/7_upgrade.sh:169 scripts/1_config_jumpserver.sh:169 -#: scripts/utils.sh:461 +#: scripts/7_upgrade.sh:219 scripts/1_config_jumpserver.sh:183 +#: scripts/utils.sh:522 msgid "Failed to change the table structure" msgstr "" -#: scripts/7_upgrade.sh:171 +#: scripts/7_upgrade.sh:221 msgid "Failed to change the table structure. Continue to upgrade" msgstr "" -#: scripts/7_upgrade.sh:182 +#: scripts/7_upgrade.sh:232 msgid "Do you need to clean up the old version image" msgstr "" -#: scripts/7_upgrade.sh:196 +#: scripts/7_upgrade.sh:245 msgid "Do you need upgrade Docker binaries" msgstr "" -#: scripts/7_upgrade.sh:216 +#: scripts/7_upgrade.sh:265 msgid "Do you need upgrade Docker Compose" msgstr "" -#: scripts/7_upgrade.sh:233 +#: scripts/7_upgrade.sh:283 msgid "Are you sure you want to update the current version to" msgstr "" -#: scripts/7_upgrade.sh:248 jmsctl.sh:59 -msgid "Backup database" -msgstr "" - -#: scripts/7_upgrade.sh:251 +#: scripts/7_upgrade.sh:301 msgid "Backup Configuration File" msgstr "" -#: scripts/7_upgrade.sh:254 +#: scripts/7_upgrade.sh:304 msgid "Apply database changes" msgstr "" -#: scripts/7_upgrade.sh:255 +#: scripts/7_upgrade.sh:305 msgid "Changing database schema may take a while, please wait patiently" msgstr "" -#: scripts/7_upgrade.sh:258 +#: scripts/7_upgrade.sh:308 msgid "Cleanup Image" msgstr "" -#: scripts/7_upgrade.sh:261 +#: scripts/7_upgrade.sh:311 msgid "Upgrade Docker" msgstr "" -#: scripts/7_upgrade.sh:264 +#: scripts/7_upgrade.sh:316 msgid "Upgrade successfully. You can now restart the program" msgstr "" +#: scripts/2_install_docker.sh:25 +msgid "Docker program does not exist" +msgstr "" + +#: scripts/2_install_docker.sh:129 +msgid "Do you want to support IPv6" +msgstr "" + +#: scripts/2_install_docker.sh:175 +msgid "Install Docker" +msgstr "" + +#: scripts/2_install_docker.sh:178 +msgid "Configure Docker" +msgstr "" + +#: scripts/2_install_docker.sh:180 +msgid "Start Docker" +msgstr "" + #: scripts/1_config_jumpserver.sh:8 msgid "Configure Private Key" msgstr "" -#: scripts/1_config_jumpserver.sh:24 +#: scripts/1_config_jumpserver.sh:28 msgid "Configure Persistent Directory" msgstr "" -#: scripts/1_config_jumpserver.sh:27 +#: scripts/1_config_jumpserver.sh:31 msgid "Do you need custom persistent store, will use the default directory" msgstr "" -#: scripts/1_config_jumpserver.sh:30 +#: scripts/1_config_jumpserver.sh:34 msgid "" "To modify the persistent directory such as logs video, you can select your " "largest disk and create a directory in it, such as" msgstr "" -#: scripts/1_config_jumpserver.sh:31 +#: scripts/1_config_jumpserver.sh:35 msgid "" "Note: you can not change it after installation, otherwise the database may " "be lost" msgstr "" -#: scripts/1_config_jumpserver.sh:35 +#: scripts/1_config_jumpserver.sh:39 msgid "Persistent storage directory" msgstr "" -#: scripts/1_config_jumpserver.sh:51 +#: scripts/1_config_jumpserver.sh:55 msgid "Please enter MySQL server IP" msgstr "" -#: scripts/1_config_jumpserver.sh:56 +#: scripts/1_config_jumpserver.sh:60 msgid "Please enter MySQL server port" msgstr "" -#: scripts/1_config_jumpserver.sh:58 +#: scripts/1_config_jumpserver.sh:62 msgid "Please enter MySQL database name" msgstr "" -#: scripts/1_config_jumpserver.sh:60 +#: scripts/1_config_jumpserver.sh:64 msgid "Please enter MySQL username" msgstr "" -#: scripts/1_config_jumpserver.sh:62 +#: scripts/1_config_jumpserver.sh:66 msgid "Please enter MySQL password" msgstr "" -#: scripts/1_config_jumpserver.sh:89 +#: scripts/1_config_jumpserver.sh:91 msgid "Configure MySQL" msgstr "" -#: scripts/1_config_jumpserver.sh:95 +#: scripts/1_config_jumpserver.sh:97 msgid "Do you want to use external MySQL" msgstr "" -#: scripts/1_config_jumpserver.sh:105 +#: scripts/1_config_jumpserver.sh:107 msgid "Please enter Redis server IP" msgstr "" -#: scripts/1_config_jumpserver.sh:110 +#: scripts/1_config_jumpserver.sh:112 msgid "Please enter Redis server port" msgstr "" -#: scripts/1_config_jumpserver.sh:112 +#: scripts/1_config_jumpserver.sh:114 msgid "Please enter Redis password" msgstr "" @@ -293,35 +351,35 @@ msgstr "" msgid "Configure Redis" msgstr "" -#: scripts/1_config_jumpserver.sh:138 +#: scripts/1_config_jumpserver.sh:142 msgid "Do you want to use external Redis" msgstr "" -#: scripts/1_config_jumpserver.sh:147 -msgid "Configure External Port" +#: scripts/1_config_jumpserver.sh:151 +msgid "Configure External Access" msgstr "" -#: scripts/1_config_jumpserver.sh:153 +#: scripts/1_config_jumpserver.sh:167 msgid "Do you need to customize the JumpServer external port" msgstr "" -#: scripts/1_config_jumpserver.sh:155 +#: scripts/1_config_jumpserver.sh:169 msgid "JumpServer web port" msgstr "" -#: scripts/1_config_jumpserver.sh:157 +#: scripts/1_config_jumpserver.sh:171 msgid "JumpServer ssh port" msgstr "" -#: scripts/1_config_jumpserver.sh:160 +#: scripts/1_config_jumpserver.sh:174 msgid "JumpServer rdp port" msgstr "" -#: scripts/1_config_jumpserver.sh:167 +#: scripts/1_config_jumpserver.sh:181 msgid "Init JumpServer Database" msgstr "" -#: scripts/8_uninstall.sh:8 +#: scripts/8_uninstall.sh:8 scripts/6_db_restore.sh:16 msgid "Make sure you have a backup of data, this operation is not reversible" msgstr "" @@ -330,190 +388,137 @@ msgid "Are you clean up JumpServer files" msgstr "" #: scripts/8_uninstall.sh:19 scripts/8_uninstall.sh:21 -#: scripts/8_uninstall.sh:23 +#: scripts/8_uninstall.sh:23 scripts/8_uninstall.sh:45 +#: scripts/8_uninstall.sh:50 scripts/8_uninstall.sh:56 msgid "Cleaning up" msgstr "" -#: scripts/8_uninstall.sh:29 +#: scripts/8_uninstall.sh:30 msgid "Do you need to clean up the Docker image" msgstr "" -#: scripts/8_uninstall.sh:39 +#: scripts/8_uninstall.sh:40 msgid "Do you need to clean up the Docker binaries" msgstr "" -#: scripts/8_uninstall.sh:52 +#: scripts/8_uninstall.sh:59 msgid "Cleanup complete" msgstr "" -#: scripts/8_uninstall.sh:56 jmsctl.sh:55 -msgid "Uninstall JumpServer" +#: scripts/3_load_images.sh:19 +msgid "Docker image not found" msgstr "" -#: scripts/0_prepare.sh:21 +#: scripts/3_load_images.sh:36 +msgid "Docker image loaded, skipping" +msgstr "" + +#: scripts/5_db_backup.sh:22 +msgid "Backing up" +msgstr "" + +#: scripts/5_db_backup.sh:33 +msgid "Backup failed" +msgstr "" + +#: scripts/5_db_backup.sh:37 +msgid "Backup succeeded! The backup file has been saved to" +msgstr "" + +#: scripts/0_prepare.sh:14 msgid "Starting to download Docker engine" msgstr "" -#: scripts/0_prepare.sh:23 +#: scripts/0_prepare.sh:16 msgid "Download docker fails, check the network is normal" msgstr "" -#: scripts/0_prepare.sh:28 +#: scripts/0_prepare.sh:21 msgid "Using Docker cache" msgstr "" -#: scripts/0_prepare.sh:43 +#: scripts/0_prepare.sh:36 msgid "Starting to download Docker Compose binary" msgstr "" -#: scripts/0_prepare.sh:45 +#: scripts/0_prepare.sh:38 msgid "Download docker-compose fails, check the network is normal" msgstr "" -#: scripts/0_prepare.sh:50 +#: scripts/0_prepare.sh:43 msgid "Using Docker Compose cache" msgstr "" -#: scripts/0_prepare.sh:63 +#: scripts/0_prepare.sh:56 msgid "Docker is not running, please install and start" msgstr "" -#: scripts/0_prepare.sh:89 +#: scripts/0_prepare.sh:82 msgid "Save image" msgstr "" -#: scripts/0_prepare.sh:92 +#: scripts/0_prepare.sh:85 msgid "The image has been saved, skipping" msgstr "" -#: scripts/0_prepare.sh:102 +#: scripts/0_prepare.sh:94 msgid "Preparing Docker offline package" msgstr "" -#: scripts/0_prepare.sh:106 +#: scripts/0_prepare.sh:98 msgid "Preparing image offline package" msgstr "" -#: scripts/utils.sh:141 +#: scripts/utils.sh:167 msgid "no default" msgstr "" -#: scripts/utils.sh:143 +#: scripts/utils.sh:169 msgid "default" msgstr "" -#: scripts/utils.sh:191 +#: scripts/utils.sh:217 msgid "complete" msgstr "" -#: scripts/utils.sh:199 +#: scripts/utils.sh:229 msgid "fail" msgstr "" -#: scripts/utils.sh:292 +#: scripts/utils.sh:344 msgid "command not found, Please install it first" msgstr "" -#: scripts/utils.sh:319 +#: scripts/utils.sh:376 msgid "Check Configuration File" msgstr "" -#: scripts/utils.sh:320 +#: scripts/utils.sh:377 msgid "Path to Configuration file" msgstr "" -#: jmsctl.sh:15 -msgid "Configuration file not found" -msgstr "" - -#: jmsctl.sh:16 -msgid "If you are upgrading from v1.5.x, please copy the config.txt To" -msgstr "" - -#: jmsctl.sh:21 -msgid "There is a problem with the soft connection, Please update it again" -msgstr "" - -#: jmsctl.sh:36 -msgid "JumpServer Deployment Management Script" -msgstr "" - -#: jmsctl.sh:43 -msgid "Install JumpServer" -msgstr "" - -#: jmsctl.sh:44 -msgid "Upgrade JumpServer" -msgstr "" - -#: jmsctl.sh:45 -msgid "Check for updates JumpServer" -msgstr "" - -#: jmsctl.sh:46 -msgid "Reconfiguration JumpServer" -msgstr "" - -#: jmsctl.sh:49 -msgid "Start JumpServer" -msgstr "" - -#: jmsctl.sh:50 -msgid "Stop JumpServer" -msgstr "" - -#: jmsctl.sh:51 -msgid "Close JumpServer" -msgstr "" - -#: jmsctl.sh:52 -msgid "Restart JumpServer" -msgstr "" - -#: jmsctl.sh:53 -msgid "Check JumpServer" -msgstr "" - -#: jmsctl.sh:54 -msgid "Offline JumpServer" -msgstr "" - -#: jmsctl.sh:58 -msgid "Loading docker image" -msgstr "" - -#: jmsctl.sh:60 -msgid "Data recovery through database backup file" -msgstr "" - -#: jmsctl.sh:61 -msgid "Execute the original docker-compose command" -msgstr "" - -#: jmsctl.sh:62 -msgid "View log" -msgstr "" - -#: jmsctl.sh:123 -msgid "The current version is up to date" +#: scripts/6_db_restore.sh:20 +msgid "file does not exist" msgstr "" -#: jmsctl.sh:128 -msgid "The latest version is" +#: scripts/6_db_restore.sh:26 +msgid "Start restoring database" msgstr "" -#: jmsctl.sh:132 -msgid "The current version is" +#: scripts/6_db_restore.sh:34 +msgid "" +"Database recovery failed. Please check whether the database file is complete " +"or try to recover manually" msgstr "" -#: jmsctl.sh:157 jmsctl.sh:163 -msgid "Unsupported Operating System Error" +#: scripts/6_db_restore.sh:37 +msgid "Database recovered successfully" msgstr "" -#: jmsctl.sh:158 -msgid "macOS installer please see" +#: scripts/6_db_restore.sh:48 +msgid "Format error" msgstr "" -#: jmsctl.sh:164 -msgid "Windows installer please see" +#: scripts/6_db_restore.sh:52 +msgid "The backup file does not exist" msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/jumpserver-installer.mo b/locale/zh_CN/LC_MESSAGES/jumpserver-installer.mo index 866b34dd58593bd898aa9843197702f620fb76e2..7ef466dfb29e58c3e3dd77c2bd52e514e0cf34d3 100644 GIT binary patch delta 2630 zcmYk;4NO&K9LMoL3J8kHi-ZE^!O##hQb7`j0$M6!AZkQLdBv;v0w~~1fx9|iYO$Q| zrmk?gm9D0yOPsXUG&O5&ZRVQGvb0(zY^}7Vvz6KRckkoY+5O+od7g95^YVY5!{z(g zUsnb$Cr0ixjy58l_@}qoJNR86zBtzPHM<{Qzzp1uPIp0XxZwI=+Z}>?U7&Fe1(@9tWTv@KE=SbM+Od4t=N&Tk!#G$7DR< z>OaP8%3tD8{2P~G8lA+`zikSgn7xMeT-c9OFzG(CQCNjpxCuw&AQX0Fq?n{Sd1;m zr0h6O#xqE2tv6|7jFyhd;3&S7!Aa=hd<;CqNgF3gxX<~4^9vkE{SVHY_&DXh+{{?4 z0xQwy%Eypf>?~?&E@CSFf$F$Fjd_@j%GAt(@K|RJc+t~$z8vV`IJ*w zU=PbtYq}EE(RS1T4kG)|P9Tri=dS)TDpNO58TvPw{A+WhurON75>x|zRLAR31KWvO zs$=*P=B9+#@*~Wk{1xi?n@HO>h}N}-9>Mk4gc`_o)O}H;M@y3x;6xqfV;+{GX0pN6 zcVGAc`p$2vuwMVXCG^X;9CX#`=zYO&T&%;QpK~}*QA|G4Bm)Z;L;G`_VY!7PW zJuHki*Y)cl|G{q&$H2({l@*jX0HZ8&1@s zp5lbT*&S4BQrS^zC=VaS8q{vxhPv+nvds1wYM@t~w_SaL7p@&a5BzB&7d9CQ3omm@1X|rDXP71P?`E2*`F52 zh9WsO0#$wjb$vl5`B%kycf)RXLl@>ye;zf1h~eRe2cyb4r~ynv4Y1l>U+n7JP#M|g z>h~aXvZJUazJPlE`f&2E8TBIX8hIiv#4KEf?WpUwP&18YL6yp(sQN-=k~Rx#a22ZI zbLioZsDbq22SoMpI1-1U22>W{L?dcM&Eyr-d$}7m)3@+p{1Bt@8fpN)xpEw>>Ge!P zT_1uPSSD&hxu|waF#^XD&k;K26A4QHDq63q6GPsq(>23ms4MO-n}p ztRhsye+I!ZF)7K))&zo=C^VobToJ5^NeQgwteEf<25Rzkngd4!Io!BesM)%D>*Xhjxt{*)^Vtu+xEtc!ayX8a1jui5YU8(REL zUQ3DrQ*Wj!7dyR{|($)1V=lGk}_?tQ-lXGMG?c3F}>D}(b zCwq1u?wm4YYM-3$BVFAmf>*cf|KF|NwKq10?@^<_yu7P>!xr!A-o011zuLJqvnujG D8#*65 delta 2509 zcmYk-e@xVM9LMqZ@k8$pOY}e>qz(`zg9;1~+7c#crUpl08U4Z^A=G6MsetbKv4(9m zrx(s#%S}OB7OY+Vk#4o+D%;YbZMj@wTT&})&1s9Rte&sCk6Yi}`yQXq=lkRH`Mf`$ z@7>wv??RFBnJI(D(ND}Kt|Xfs!Y`-t#j(L}HVZp2AD_oc+>dG21L+qZHKf3FKoFeCftZn2!IVZb+Y&xULY@UW-{6LUq`IH)1bl z;vUyNg7c|=gg4>O*p5CrNvD77iWkgY#4snKxEMXxo85v9Sd3j*ihHpFPhbK5gN2yS zC~~m@m8mx8OPEJ}7?sK6cpIKmJN=uV>CmSYV>wo04R)XgFyz|Da1Qn48D`a3jCHsM znUoFTB77f7tzAOKW`5GA4Ce5qOqXB~mtkZcg-!|q+~qvzJc=2#pK|_y4b&%*vDjVQ z)QpX&`hMh;#ZY_UGrR%6M|J!c1~Hq5DpS=NiTzG{bSVir=8;oBX-eUFp28e z&%2_xp%C?eGSrRrsDXxDd%J7zLv7*#cYYL`sekIuXS0sFzXgQ3!)mb#HG?g<0$)aD<_s!R6R4D5My+)!J52-4L6Tr)sOL61*E{<$ zqTRWZLVTB^*6UUqfMphEANpI_QF}s2RSBO5w0;KaNbozQRZFPt=23SnwdWqn2bls(m-! zjBld`bOtq`KTs1%kMPf;_c0GO^I|N)TAYGm)Bt*1eHZGre8bfbpa%R7YDPy<4<17g zmJ=GNj)w@P{TX55sgGUpq~4ym)_}c46+hkoYchM()#l?J#DfHz#_lFo6RVPC4#L(`a4v$XkI1qa+uYPLGQ?x4O EKi$0Xp#T5? diff --git a/locale/zh_CN/LC_MESSAGES/jumpserver-installer.po b/locale/zh_CN/LC_MESSAGES/jumpserver-installer.po index fa06b566..e71b1d3c 100644 --- a/locale/zh_CN/LC_MESSAGES/jumpserver-installer.po +++ b/locale/zh_CN/LC_MESSAGES/jumpserver-installer.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-28 04:49+0000\n" +"POT-Creation-Date: 2023-08-18 07:21+0000\n" "PO-Revision-Date: 2021-01-21 19:15+0800\n" "Last-Translator: Bai \n" "Language-Team: Language locale/zh\n" @@ -16,71 +16,109 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: scripts/6_db_restore.sh:16 -msgid "Start restoring database" -msgstr "开始还原数据库" +#: jmsctl.sh:15 +msgid "Configuration file not found" +msgstr "配置文件没有发现" -#: scripts/6_db_restore.sh:20 -msgid "file does not exist" -msgstr "文件不存在" +#: jmsctl.sh:16 +msgid "If you are upgrading from v1.5.x, please copy the config.txt To" +msgstr "如果你是从 v1.5.x 升级的, 请 copy 之前目录中的 config.txt 到" -#: scripts/6_db_restore.sh:32 -msgid "" -"Database recovery failed. Please check whether the database file is complete " -"or try to recover manually" -msgstr "数据库恢复失败. 请检查数据库文件是否完整, 或尝试手动恢复" +#: jmsctl.sh:21 +msgid "There is a problem with the soft connection, Please update it again" +msgstr "软连接存在问题, 重新更新" -#: scripts/6_db_restore.sh:35 -msgid "Database recovered successfully" -msgstr "数据库恢复成功" +#: jmsctl.sh:40 +msgid "JumpServer Deployment Management Script" +msgstr "JumpServer 部署管理脚本" -#: scripts/6_db_restore.sh:46 -msgid "Format error" -msgstr "格式错误" +#: jmsctl.sh:47 +msgid "Install JumpServer" +msgstr "安装 JumpServer" -#: scripts/6_db_restore.sh:50 -msgid "The backup file does not exist" -msgstr "备份文件不存在" +#: jmsctl.sh:48 +msgid "Upgrade JumpServer" +msgstr "升级 JumpServer" -#: scripts/2_install_docker.sh:22 -msgid "Docker program does not exist" -msgstr "Docker 程序不存在" +#: jmsctl.sh:49 +msgid "Check for updates JumpServer" +msgstr "检查 JumpServer" -#: scripts/2_install_docker.sh:127 -msgid "Do you want to support IPv6" -msgstr "是否需要支持 IPv6" +#: jmsctl.sh:50 +msgid "Reconfiguration JumpServer" +msgstr "重新配置 JumpServer" -#: scripts/2_install_docker.sh:173 -msgid "Install Docker" -msgstr "安装 Docker" +#: jmsctl.sh:53 +msgid "Start JumpServer" +msgstr "启动 JumpServer" -#: scripts/2_install_docker.sh:176 -msgid "Configure Docker" -msgstr "配置 Docker" +#: jmsctl.sh:54 +msgid "Stop JumpServer" +msgstr "停止 JumpServer" -#: scripts/2_install_docker.sh:178 -msgid "Start Docker" -msgstr "启动 Docker" +#: jmsctl.sh:55 +msgid "Close JumpServer" +msgstr "关闭 JumpServer" -#: scripts/3_load_images.sh:20 -msgid "Docker image not found" -msgstr "镜像文件没有发现" +#: jmsctl.sh:56 +msgid "Restart JumpServer" +msgstr "重启 JumpServer" -#: scripts/3_load_images.sh:38 -msgid "Docker image loaded, skipping" -msgstr "镜像已加载, 跳过" +#: jmsctl.sh:57 +msgid "Check JumpServer" +msgstr "检查 JumpServer" -#: scripts/5_db_backup.sh:22 -msgid "Backing up" -msgstr "正在备份" +#: jmsctl.sh:58 +msgid "Offline JumpServer" +msgstr "下线 JumpServer" -#: scripts/5_db_backup.sh:33 -msgid "Backup failed" -msgstr "备份失败" +#: jmsctl.sh:59 scripts/8_uninstall.sh:63 +msgid "Uninstall JumpServer" +msgstr "卸载 JumpServer" -#: scripts/5_db_backup.sh:37 -msgid "Backup succeeded! The backup file has been saved to" -msgstr "备份成功! 备份文件已存放至" +#: jmsctl.sh:62 +msgid "Loading docker image" +msgstr "加载 Docker 镜像" + +#: jmsctl.sh:63 scripts/7_upgrade.sh:298 +msgid "Backup database" +msgstr "备份数据库" + +#: jmsctl.sh:64 +msgid "Data recovery through database backup file" +msgstr "通过数据库备份文件恢复数据" + +#: jmsctl.sh:65 +msgid "Execute the original docker-compose command" +msgstr "执行原始 docker-compose 命令" + +#: jmsctl.sh:66 +msgid "View log" +msgstr "查看日志" + +#: jmsctl.sh:127 +msgid "The current version is up to date" +msgstr "当前版本已是最新" + +#: jmsctl.sh:132 +msgid "The latest version is" +msgstr "最新版本是" + +#: jmsctl.sh:136 +msgid "The current version is" +msgstr "当前版本是" + +#: jmsctl.sh:181 jmsctl.sh:187 +msgid "Unsupported Operating System Error" +msgstr "错误: 不支持的操作系统" + +#: jmsctl.sh:182 +msgid "macOS installer please see" +msgstr "macOS 安装请参考" + +#: jmsctl.sh:188 +msgid "Windows installer please see" +msgstr "Windows 安装请参考" #: scripts/4_install_jumpserver.sh:10 msgid "" @@ -101,194 +139,214 @@ msgstr "" msgid "The Installation is Complete" msgstr "安装完成了" -#: scripts/4_install_jumpserver.sh:30 +#: scripts/4_install_jumpserver.sh:37 msgid "You can use the following command to start, and then visit" msgstr "可以使用如下命令启动, 然后访问" -#: scripts/4_install_jumpserver.sh:34 +#: scripts/4_install_jumpserver.sh:41 msgid "Other management commands" msgstr "其它一些管理命令" -#: scripts/4_install_jumpserver.sh:39 +#: scripts/4_install_jumpserver.sh:46 msgid "For more commands, you can enter ./jmsctl.sh --help to understand" msgstr "更多还有一些命令, 你可以 ./jmsctl.sh --help 来了解" -#: scripts/4_install_jumpserver.sh:41 +#: scripts/4_install_jumpserver.sh:48 msgid "Web access" msgstr "Web 访问" -#: scripts/4_install_jumpserver.sh:48 +#: scripts/4_install_jumpserver.sh:55 msgid "Default username" msgstr "默认用户" -#: scripts/4_install_jumpserver.sh:48 +#: scripts/4_install_jumpserver.sh:55 msgid "Default password" msgstr "默认密码" -#: scripts/4_install_jumpserver.sh:50 +#: scripts/4_install_jumpserver.sh:57 msgid "access" msgstr "访问" -#: scripts/4_install_jumpserver.sh:54 +#: scripts/4_install_jumpserver.sh:61 msgid "More information" msgstr "更多信息" -#: scripts/4_install_jumpserver.sh:55 +#: scripts/4_install_jumpserver.sh:62 msgid "Official Website" msgstr "我们的官网" -#: scripts/4_install_jumpserver.sh:56 +#: scripts/4_install_jumpserver.sh:63 msgid "Documentation" msgstr "我们的文档" -#: scripts/4_install_jumpserver.sh:65 +#: scripts/4_install_jumpserver.sh:73 msgid "Install and Configure Docker" msgstr "安装配置 Docker" -#: scripts/4_install_jumpserver.sh:69 scripts/7_upgrade.sh:245 +#: scripts/4_install_jumpserver.sh:77 scripts/7_upgrade.sh:295 msgid "Loading Docker Image" msgstr "加载 Docker 镜像" -#: scripts/4_install_jumpserver.sh:73 +#: scripts/4_install_jumpserver.sh:81 msgid "Install and Configure JumpServer" msgstr "安装配置 JumpServer" -#: scripts/7_upgrade.sh:137 +#: scripts/7_upgrade.sh:92 scripts/1_config_jumpserver.sh:158 +msgid "Please enter the access IP or domain name of JumpServer" +msgstr "请输入 JumpServer 的访问 IP 或者 域名" + +#: scripts/7_upgrade.sh:186 msgid "Back up to" msgstr "备份至" -#: scripts/7_upgrade.sh:144 +#: scripts/7_upgrade.sh:193 msgid "Failed to backup the database. Continue to upgrade" msgstr "备份数据库失败, 继续升级吗" -#: scripts/7_upgrade.sh:150 +#: scripts/7_upgrade.sh:199 msgid "Skip database backup" msgstr "跳过备份数据库" -#: scripts/7_upgrade.sh:157 +#: scripts/7_upgrade.sh:206 msgid "" "Detected that the JumpServer container is running. Do you want to close the " "container and continue to upgrade" msgstr "检测到 JumpServer 正在运行, 是否需要关闭并继续升级" -#: scripts/7_upgrade.sh:169 scripts/1_config_jumpserver.sh:169 -#: scripts/utils.sh:461 +#: scripts/7_upgrade.sh:219 scripts/1_config_jumpserver.sh:183 +#: scripts/utils.sh:522 msgid "Failed to change the table structure" msgstr "表结构变更失败" -#: scripts/7_upgrade.sh:171 +#: scripts/7_upgrade.sh:221 msgid "Failed to change the table structure. Continue to upgrade" msgstr "表结构变更失败, 是否继续" -#: scripts/7_upgrade.sh:182 +#: scripts/7_upgrade.sh:232 msgid "Do you need to clean up the old version image" msgstr "是否需要清理旧版本镜像文件" -#: scripts/7_upgrade.sh:196 +#: scripts/7_upgrade.sh:245 msgid "Do you need upgrade Docker binaries" msgstr "是否升级 Docker binaries" -#: scripts/7_upgrade.sh:216 +#: scripts/7_upgrade.sh:265 msgid "Do you need upgrade Docker Compose" msgstr "是否升级 Docker Compose" -#: scripts/7_upgrade.sh:233 +#: scripts/7_upgrade.sh:283 msgid "Are you sure you want to update the current version to" msgstr "是否将版本更新至" -#: scripts/7_upgrade.sh:248 jmsctl.sh:59 -msgid "Backup database" -msgstr "备份数据库" - -#: scripts/7_upgrade.sh:251 +#: scripts/7_upgrade.sh:301 msgid "Backup Configuration File" msgstr "备份配置文件" -#: scripts/7_upgrade.sh:254 +#: scripts/7_upgrade.sh:304 msgid "Apply database changes" msgstr "进行数据库变更" -#: scripts/7_upgrade.sh:255 +#: scripts/7_upgrade.sh:305 msgid "Changing database schema may take a while, please wait patiently" msgstr "表结构变更可能需要一段时间, 请耐心等待" -#: scripts/7_upgrade.sh:258 +#: scripts/7_upgrade.sh:308 msgid "Cleanup Image" msgstr "清理镜像" -#: scripts/7_upgrade.sh:261 +#: scripts/7_upgrade.sh:311 msgid "Upgrade Docker" msgstr "升级 Docker" -#: scripts/7_upgrade.sh:264 +#: scripts/7_upgrade.sh:316 msgid "Upgrade successfully. You can now restart the program" msgstr "升级成功, 可以重新启动程序了" +#: scripts/2_install_docker.sh:25 +msgid "Docker program does not exist" +msgstr "Docker 程序不存在" + +#: scripts/2_install_docker.sh:129 +msgid "Do you want to support IPv6" +msgstr "是否需要支持 IPv6" + +#: scripts/2_install_docker.sh:175 +msgid "Install Docker" +msgstr "安装 Docker" + +#: scripts/2_install_docker.sh:178 +msgid "Configure Docker" +msgstr "配置 Docker" + +#: scripts/2_install_docker.sh:180 +msgid "Start Docker" +msgstr "启动 Docker" + #: scripts/1_config_jumpserver.sh:8 msgid "Configure Private Key" msgstr "配置加密密钥" -#: scripts/1_config_jumpserver.sh:24 +#: scripts/1_config_jumpserver.sh:28 msgid "Configure Persistent Directory" msgstr "配置持久化目录" -#: scripts/1_config_jumpserver.sh:27 +#: scripts/1_config_jumpserver.sh:31 msgid "Do you need custom persistent store, will use the default directory" msgstr "是否需要自定义持久化存储, 默认将使用目录" -#: scripts/1_config_jumpserver.sh:30 +#: scripts/1_config_jumpserver.sh:34 msgid "" "To modify the persistent directory such as logs video, you can select your " "largest disk and create a directory in it, such as" msgstr "修改日志录像等持久化的目录，可以找个最大的磁盘，并创建目录，如" -#: scripts/1_config_jumpserver.sh:31 +#: scripts/1_config_jumpserver.sh:35 msgid "" "Note: you can not change it after installation, otherwise the database may " "be lost" msgstr "注意：安装后不能更改，否则数据库可能会丢失" -#: scripts/1_config_jumpserver.sh:35 +#: scripts/1_config_jumpserver.sh:39 msgid "Persistent storage directory" msgstr "持久化存储目录" -#: scripts/1_config_jumpserver.sh:51 +#: scripts/1_config_jumpserver.sh:55 msgid "Please enter MySQL server IP" msgstr "请输入 mysql 的主机地址" -#: scripts/1_config_jumpserver.sh:56 +#: scripts/1_config_jumpserver.sh:60 msgid "Please enter MySQL server port" msgstr "请输入 mysql 的端口" -#: scripts/1_config_jumpserver.sh:58 +#: scripts/1_config_jumpserver.sh:62 msgid "Please enter MySQL database name" msgstr "请输入 mysql 的数据库" -#: scripts/1_config_jumpserver.sh:60 +#: scripts/1_config_jumpserver.sh:64 msgid "Please enter MySQL username" msgstr "请输入 mysql 的用户名" -#: scripts/1_config_jumpserver.sh:62 +#: scripts/1_config_jumpserver.sh:66 msgid "Please enter MySQL password" msgstr "请输入 mysql 的密码" -#: scripts/1_config_jumpserver.sh:89 +#: scripts/1_config_jumpserver.sh:91 msgid "Configure MySQL" msgstr "配置 MySQL" -#: scripts/1_config_jumpserver.sh:95 +#: scripts/1_config_jumpserver.sh:97 msgid "Do you want to use external MySQL" msgstr "是否使用外部 MySQL" -#: scripts/1_config_jumpserver.sh:105 +#: scripts/1_config_jumpserver.sh:107 msgid "Please enter Redis server IP" msgstr "请输入 Redis 的主机地址" -#: scripts/1_config_jumpserver.sh:110 +#: scripts/1_config_jumpserver.sh:112 msgid "Please enter Redis server port" msgstr "请输入 Redis 的端口" -#: scripts/1_config_jumpserver.sh:112 +#: scripts/1_config_jumpserver.sh:114 msgid "Please enter Redis password" msgstr "请输入 Redis 的密码" @@ -296,35 +354,35 @@ msgstr "请输入 Redis 的密码" msgid "Configure Redis" msgstr "配置 Redis" -#: scripts/1_config_jumpserver.sh:138 +#: scripts/1_config_jumpserver.sh:142 msgid "Do you want to use external Redis" msgstr "是否使用外部 Redis" -#: scripts/1_config_jumpserver.sh:147 -msgid "Configure External Port" -msgstr "配置对外端口" +#: scripts/1_config_jumpserver.sh:151 +msgid "Configure External Access" +msgstr "配置外部访问" -#: scripts/1_config_jumpserver.sh:153 +#: scripts/1_config_jumpserver.sh:167 msgid "Do you need to customize the JumpServer external port" msgstr "是否需要配置 JumpServer 对外访问端口" -#: scripts/1_config_jumpserver.sh:155 +#: scripts/1_config_jumpserver.sh:169 msgid "JumpServer web port" msgstr "JumpServer web 端口" -#: scripts/1_config_jumpserver.sh:157 +#: scripts/1_config_jumpserver.sh:171 msgid "JumpServer ssh port" msgstr "JumpServer ssh 端口" -#: scripts/1_config_jumpserver.sh:160 +#: scripts/1_config_jumpserver.sh:174 msgid "JumpServer rdp port" msgstr "JumpServer rdp 端口" -#: scripts/1_config_jumpserver.sh:167 +#: scripts/1_config_jumpserver.sh:181 msgid "Init JumpServer Database" msgstr "初始化数据库" -#: scripts/8_uninstall.sh:8 +#: scripts/8_uninstall.sh:8 scripts/6_db_restore.sh:16 msgid "Make sure you have a backup of data, this operation is not reversible" msgstr "请确认已经备份好相关数据, 此操作不可逆" @@ -333,193 +391,140 @@ msgid "Are you clean up JumpServer files" msgstr "确认清理 JumpServer 相关文件" #: scripts/8_uninstall.sh:19 scripts/8_uninstall.sh:21 -#: scripts/8_uninstall.sh:23 +#: scripts/8_uninstall.sh:23 scripts/8_uninstall.sh:45 +#: scripts/8_uninstall.sh:50 scripts/8_uninstall.sh:56 msgid "Cleaning up" msgstr "正在清理" -#: scripts/8_uninstall.sh:29 +#: scripts/8_uninstall.sh:30 msgid "Do you need to clean up the Docker image" msgstr "是否清理 Docker 镜像" -#: scripts/8_uninstall.sh:39 +#: scripts/8_uninstall.sh:40 msgid "Do you need to clean up the Docker binaries" msgstr "是否清理 Docker binaries" -#: scripts/8_uninstall.sh:52 +#: scripts/8_uninstall.sh:59 msgid "Cleanup complete" msgstr "清理完成" -#: scripts/8_uninstall.sh:56 jmsctl.sh:55 -msgid "Uninstall JumpServer" -msgstr "卸载 JumpServer" +#: scripts/3_load_images.sh:19 +msgid "Docker image not found" +msgstr "镜像文件没有发现" -#: scripts/0_prepare.sh:21 +#: scripts/3_load_images.sh:36 +msgid "Docker image loaded, skipping" +msgstr "镜像已加载, 跳过" + +#: scripts/5_db_backup.sh:22 +msgid "Backing up" +msgstr "正在备份" + +#: scripts/5_db_backup.sh:33 +msgid "Backup failed" +msgstr "备份失败" + +#: scripts/5_db_backup.sh:37 +msgid "Backup succeeded! The backup file has been saved to" +msgstr "备份成功! 备份文件已存放至" + +#: scripts/0_prepare.sh:14 msgid "Starting to download Docker engine" msgstr "开始下载 Docker 程序" -#: scripts/0_prepare.sh:23 +#: scripts/0_prepare.sh:16 msgid "Download docker fails, check the network is normal" msgstr "下载 docker 失败, 请检查网络是否正常" -#: scripts/0_prepare.sh:28 +#: scripts/0_prepare.sh:21 msgid "Using Docker cache" msgstr "使用 Docker 缓存文件" -#: scripts/0_prepare.sh:43 +#: scripts/0_prepare.sh:36 msgid "Starting to download Docker Compose binary" msgstr "开始下载 Docker Compose 程序" -#: scripts/0_prepare.sh:45 +#: scripts/0_prepare.sh:38 msgid "Download docker-compose fails, check the network is normal" msgstr "下载 docker-compose 失败, 请检查网络是否正常" -#: scripts/0_prepare.sh:50 +#: scripts/0_prepare.sh:43 msgid "Using Docker Compose cache" msgstr "使用 Docker Compose 缓存文件" -#: scripts/0_prepare.sh:63 +#: scripts/0_prepare.sh:56 msgid "Docker is not running, please install and start" msgstr "Docker 没有运行, 请安装并启动" -#: scripts/0_prepare.sh:89 +#: scripts/0_prepare.sh:82 msgid "Save image" msgstr "保存镜像" -#: scripts/0_prepare.sh:92 +#: scripts/0_prepare.sh:85 msgid "The image has been saved, skipping" msgstr "已保存过该镜像, 跳过" -#: scripts/0_prepare.sh:102 +#: scripts/0_prepare.sh:94 msgid "Preparing Docker offline package" msgstr "准备 Docker 离线包" -#: scripts/0_prepare.sh:106 +#: scripts/0_prepare.sh:98 msgid "Preparing image offline package" msgstr "准备镜像离线包" -#: scripts/utils.sh:141 +#: scripts/utils.sh:167 msgid "no default" msgstr "无默认值" -#: scripts/utils.sh:143 +#: scripts/utils.sh:169 msgid "default" msgstr "默认为" -#: scripts/utils.sh:191 +#: scripts/utils.sh:217 msgid "complete" msgstr "完成" -#: scripts/utils.sh:199 +#: scripts/utils.sh:229 msgid "fail" msgstr "失败" -#: scripts/utils.sh:292 +#: scripts/utils.sh:344 msgid "command not found, Please install it first" msgstr "未找到命令, 请先安装" -#: scripts/utils.sh:319 +#: scripts/utils.sh:376 msgid "Check Configuration File" msgstr "检查配置文件" -#: scripts/utils.sh:320 +#: scripts/utils.sh:377 msgid "Path to Configuration file" msgstr "配置文件位置" -#: jmsctl.sh:15 -msgid "Configuration file not found" -msgstr "配置文件没有发现" - -#: jmsctl.sh:16 -msgid "If you are upgrading from v1.5.x, please copy the config.txt To" -msgstr "如果你是从 v1.5.x 升级的, 请 copy 之前目录中的 config.txt 到" - -#: jmsctl.sh:21 -msgid "There is a problem with the soft connection, Please update it again" -msgstr "软连接存在问题, 重新更新" - -#: jmsctl.sh:36 -msgid "JumpServer Deployment Management Script" -msgstr "JumpServer 部署管理脚本" - -#: jmsctl.sh:43 -msgid "Install JumpServer" -msgstr "安装 JumpServer" - -#: jmsctl.sh:44 -msgid "Upgrade JumpServer" -msgstr "升级 JumpServer" - -#: jmsctl.sh:45 -msgid "Check for updates JumpServer" -msgstr "检查 JumpServer" - -#: jmsctl.sh:46 -msgid "Reconfiguration JumpServer" -msgstr "重新配置 JumpServer" - -#: jmsctl.sh:49 -msgid "Start JumpServer" -msgstr "启动 JumpServer" - -#: jmsctl.sh:50 -msgid "Stop JumpServer" -msgstr "停止 JumpServer" - -#: jmsctl.sh:51 -msgid "Close JumpServer" -msgstr "关闭 JumpServer" - -#: jmsctl.sh:52 -msgid "Restart JumpServer" -msgstr "重启 JumpServer" - -#: jmsctl.sh:53 -msgid "Check JumpServer" -msgstr "检查 JumpServer" - -#: jmsctl.sh:54 -msgid "Offline JumpServer" -msgstr "下线 JumpServer" - -#: jmsctl.sh:58 -msgid "Loading docker image" -msgstr "加载 Docker 镜像" - -#: jmsctl.sh:60 -msgid "Data recovery through database backup file" -msgstr "通过数据库备份文件恢复数据" - -#: jmsctl.sh:61 -msgid "Execute the original docker-compose command" -msgstr "执行原始 docker-compose 命令" - -#: jmsctl.sh:62 -msgid "View log" -msgstr "查看日志" - -#: jmsctl.sh:123 -msgid "The current version is up to date" -msgstr "当前版本已是最新" +#: scripts/6_db_restore.sh:20 +msgid "file does not exist" +msgstr "文件不存在" -#: jmsctl.sh:128 -msgid "The latest version is" -msgstr "最新版本是" +#: scripts/6_db_restore.sh:26 +msgid "Start restoring database" +msgstr "开始还原数据库" -#: jmsctl.sh:132 -msgid "The current version is" -msgstr "当前版本是" +#: scripts/6_db_restore.sh:34 +msgid "" +"Database recovery failed. Please check whether the database file is complete " +"or try to recover manually" +msgstr "数据库恢复失败. 请检查数据库文件是否完整, 或尝试手动恢复" -#: jmsctl.sh:157 jmsctl.sh:163 -msgid "Unsupported Operating System Error" -msgstr "错误: 不支持的操作系统" +#: scripts/6_db_restore.sh:37 +msgid "Database recovered successfully" +msgstr "数据库恢复成功" -#: jmsctl.sh:158 -msgid "macOS installer please see" -msgstr "macOS 安装请参考" +#: scripts/6_db_restore.sh:48 +msgid "Format error" +msgstr "格式错误" -#: jmsctl.sh:164 -msgid "Windows installer please see" -msgstr "Windows 安装请参考" +#: scripts/6_db_restore.sh:52 +msgid "The backup file does not exist" +msgstr "备份文件不存在" #~ msgid "There are updates available currently. Do you want to update" #~ msgstr "检测到 Docker 版本有更新, 是否更新" diff --git a/scripts/1_config_jumpserver.sh b/scripts/1_config_jumpserver.sh index e8aa8619..e27a6ec0 100644 --- a/scripts/1_config_jumpserver.sh +++ b/scripts/1_config_jumpserver.sh @@ -147,12 +147,24 @@ function set_redis() { fi } -function set_service_port() { - echo_yellow "\n5. $(gettext 'Configure External Port')" +function set_service() { + echo_yellow "\n5. $(gettext 'Configure External Access')" http_port=$(get_config HTTP_PORT) ssh_port=$(get_config SSH_PORT) rdp_port=$(get_config RDP_PORT) use_xpack=$(get_config_or_env USE_XPACK) + domains=$(get_config DOMAINS) + if [[ -z "${domains}" ]]; then + read_from_input domains "$(gettext 'Please enter the access IP or domain name of JumpServer') (eg: demo.jumpserver.org:443, or eg: 172.17.200.191:80)" "" "${domains}" + if [[ -z "${domains}" ]] || [[ "${domains}" == "y" ]] || [[ "${domains}" == "n" ]]; then + host=$(get_host_ip) + if [[ -n "${host}" ]]; then + domains="${host}" + fi + fi + set_config DOMAINS "${domains}" + fi + confirm="n" read_from_input confirm "$(gettext 'Do you need to customize the JumpServer external port')?" "y/n" "${confirm}" if [[ "${confirm}" == "y" ]]; then @@ -188,7 +200,7 @@ function main() { if set_redis; then echo_done fi - if set_service_port; then + if set_service; then echo_done fi if init_db; then diff --git a/scripts/4_install_jumpserver.sh b/scripts/4_install_jumpserver.sh index af7677f9..83c201da 100644 --- a/scripts/4_install_jumpserver.sh +++ b/scripts/4_install_jumpserver.sh @@ -19,15 +19,9 @@ function pre_install() { function post_install() { echo_green "\n>>> $(gettext 'The Installation is Complete')" - domains=$(get_config DOMAINS) - host=$(command -v ip &> /dev/null && ip addr | grep 'state UP' -A2 | grep inet | grep -Ev '(127.0.0.1|inet6|docker)' | awk '{print $2}' | tr -d "addr:" | head -n 1 | cut -d / -f1) - if [ ! "${host}" ]; then - host=$(hostname -I | cut -d ' ' -f1) - fi - if [[ ${host} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - if [ ! "${domains}" ]; then - set_config DOMAINS "${host}" - fi + host=$(get_host_ip) + if [[ -z "${host}" ]]; then + host="127.0.0.1" fi http_port=$(get_config HTTP_PORT) https_port=$(get_config HTTPS_PORT) diff --git a/scripts/7_upgrade.sh b/scripts/7_upgrade.sh index e8b7f625..c438c128 100644 --- a/scripts/7_upgrade.sh +++ b/scripts/7_upgrade.sh @@ -2,6 +2,7 @@ # BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +. "${BASE_DIR}/utils.sh" . "${BASE_DIR}/2_install_docker.sh" target=$1 @@ -87,6 +88,18 @@ function upgrade_config() { MAGNUS_REDIS_PORT=63790 set_config MAGNUS_REDIS_PORT "${MAGNUS_REDIS_PORT}" fi + domains=$(get_config DOMAINS) + if [[ -z "${domains}" ]]; then + read_from_input domains "$(gettext 'Please enter the access IP or domain name of JumpServer') (eg: demo.jumpserver.org:443, or eg: 172.17.200.191:80)" "" "${domains}" + if [[ -z "${domains}" ]] || [[ "${domains}" == "y" ]] || [[ "${domains}" == "n" ]]; then + host=$(get_host_ip) + if [[ -n "${host}" ]]; then + domains="${host}" + fi + fi + fi + set_config DOMAINS "${domains}" + fi # XPACK use_xpack=$(get_config_or_env USE_XPACK) if [[ "${use_xpack}" == "1" ]]; then diff --git a/scripts/utils.sh b/scripts/utils.sh index 5f5beada..acf7fd50 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -595,3 +595,13 @@ function installation_log() { url="https://community.fit2cloud.com/installation-analytics?product=${product}&type=${install_type}&version=${version}" curl --connect-timeout 5 -m 10 -k $url > /dev/null 2>&1 } + +function get_host_ip() { + host=$(command -v ip &> /dev/null && ip addr | grep 'state UP' -A2 | grep inet | grep -Ev '(127.0.0.1|inet6|docker)' | awk '{print $2}' | tr -d "addr:" | head -n 1 | cut -d / -f1) + if [ ! "${host}" ]; then + host=$(hostname -I | cut -d ' ' -f1) + fi + if [[ ${host} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "${host}" + fi +} \ No newline at end of file