Skip to content

Commit 30db673

Browse files
committed
feat(self_check): add checks and fixes for conf.d directory existence
1 parent c5750cd commit 30db673

File tree

20 files changed

+3287
-3700
lines changed

20 files changed

+3287
-3700
lines changed

app/src/constants/errors/self_check.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ export default {
2020
40416: () => $gettext('Sbin path not exist'),
2121
40417: () => $gettext('Access log path not exist'),
2222
40418: () => $gettext('Error log path not exist'),
23+
40419: () => $gettext('Conf.d directory not exists'),
2324
}

app/src/language/ar/app.po

Lines changed: 212 additions & 216 deletions
Large diffs are not rendered by default.

app/src/language/de_DE/app.po

Lines changed: 256 additions & 281 deletions
Large diffs are not rendered by default.

app/src/language/en/app.po

Lines changed: 60 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
1-
#: src/language/generate.ts:33
1+
#: src/language/generate.ts:35
22
msgid "[Nginx UI] ACME User: %{name}, Email: %{email}, CA Dir: %{caDir}"
33
msgstr ""
44

5-
#: src/language/generate.ts:34
5+
#: src/language/generate.ts:36
66
msgid "[Nginx UI] Backing up current certificate for later revocation"
77
msgstr ""
88

9-
#: src/language/generate.ts:35
9+
#: src/language/generate.ts:37
1010
msgid "[Nginx UI] Certificate renewed successfully"
1111
msgstr ""
1212

13-
#: src/language/generate.ts:36
13+
#: src/language/generate.ts:38
1414
msgid "[Nginx UI] Certificate successfully revoked"
1515
msgstr ""
1616

17-
#: src/language/generate.ts:37
17+
#: src/language/generate.ts:39
1818
msgid ""
1919
"[Nginx UI] Certificate was used for server, reloading server TLS certificate"
2020
msgstr ""
2121

22-
#: src/language/generate.ts:38
22+
#: src/language/generate.ts:40
2323
msgid "[Nginx UI] Creating client facilitates communication with the CA server"
2424
msgstr ""
2525

26-
#: src/language/generate.ts:39
26+
#: src/language/generate.ts:41
2727
msgid "[Nginx UI] Environment variables cleaned"
2828
msgstr ""
2929

30-
#: src/language/generate.ts:40
30+
#: src/language/generate.ts:42
3131
msgid "[Nginx UI] Finished"
3232
msgstr ""
3333

34-
#: src/language/generate.ts:41
34+
#: src/language/generate.ts:43
3535
msgid "[Nginx UI] Issued certificate successfully"
3636
msgstr ""
3737

38-
#: src/language/generate.ts:42
38+
#: src/language/generate.ts:44
3939
msgid "[Nginx UI] Obtaining certificate"
4040
msgstr ""
4141

42-
#: src/language/generate.ts:43
42+
#: src/language/generate.ts:45
4343
msgid "[Nginx UI] Preparing for certificate revocation"
4444
msgstr ""
4545

46-
#: src/language/generate.ts:44
46+
#: src/language/generate.ts:46
4747
msgid "[Nginx UI] Preparing lego configurations"
4848
msgstr ""
4949

50-
#: src/language/generate.ts:45
50+
#: src/language/generate.ts:47
5151
msgid "[Nginx UI] Reloading nginx"
5252
msgstr ""
5353

54-
#: src/language/generate.ts:46
54+
#: src/language/generate.ts:48
5555
msgid "[Nginx UI] Revocation completed"
5656
msgstr ""
5757

58-
#: src/language/generate.ts:47
58+
#: src/language/generate.ts:49
5959
msgid "[Nginx UI] Revoking certificate"
6060
msgstr ""
6161

62-
#: src/language/generate.ts:48
62+
#: src/language/generate.ts:50
6363
msgid "[Nginx UI] Revoking old certificate"
6464
msgstr ""
6565

66-
#: src/language/generate.ts:49
66+
#: src/language/generate.ts:51
6767
msgid "[Nginx UI] Setting DNS01 challenge provider"
6868
msgstr ""
6969

70-
#: src/language/generate.ts:51
70+
#: src/language/generate.ts:53
7171
msgid "[Nginx UI] Setting environment variables"
7272
msgstr ""
7373

74-
#: src/language/generate.ts:50
74+
#: src/language/generate.ts:52
7575
msgid "[Nginx UI] Setting HTTP01 challenge provider"
7676
msgstr ""
7777

78-
#: src/language/generate.ts:52
78+
#: src/language/generate.ts:54
7979
msgid "[Nginx UI] Writing certificate private key to disk"
8080
msgstr ""
8181

82-
#: src/language/generate.ts:53
82+
#: src/language/generate.ts:55
8383
msgid "[Nginx UI] Writing certificate to disk"
8484
msgstr ""
8585

@@ -816,7 +816,12 @@ msgid ""
816816
"prevents using Passkeys and clipboard features"
817817
msgstr ""
818818

819-
#: src/language/generate.ts:8
819+
#: src/language/generate.ts:7
820+
msgid ""
821+
"Check if the conf.d directory is under the nginx configuration directory"
822+
msgstr ""
823+
824+
#: src/language/generate.ts:9
820825
msgid ""
821826
"Check if the nginx access log path exists. By default, this path is obtained "
822827
"from 'nginx -V'. If it cannot be obtained or the obtained path does not "
@@ -826,15 +831,15 @@ msgid ""
826831
"nginx.html#accesslogpath"
827832
msgstr ""
828833

829-
#: src/language/generate.ts:9
834+
#: src/language/generate.ts:10
830835
msgid "Check if the nginx configuration directory exists"
831836
msgstr ""
832837

833-
#: src/language/generate.ts:10
838+
#: src/language/generate.ts:11
834839
msgid "Check if the nginx configuration entry file exists"
835840
msgstr ""
836841

837-
#: src/language/generate.ts:11
842+
#: src/language/generate.ts:12
838843
msgid ""
839844
"Check if the nginx error log path exists. By default, this path is obtained "
840845
"from 'nginx -V'. If it cannot be obtained or the obtained path does not "
@@ -844,7 +849,7 @@ msgid ""
844849
"nginx.html#errorlogpath"
845850
msgstr ""
846851

847-
#: src/language/generate.ts:7
852+
#: src/language/generate.ts:8
848853
msgid ""
849854
"Check if the nginx PID path exists. By default, this path is obtained from "
850855
"'nginx -V'. If it cannot be obtained, an error will be reported. In this "
@@ -853,29 +858,29 @@ msgid ""
853858
"config-nginx.html#pidpath"
854859
msgstr ""
855860

856-
#: src/language/generate.ts:12
861+
#: src/language/generate.ts:13
857862
msgid "Check if the nginx sbin path exists"
858863
msgstr ""
859864

860-
#: src/language/generate.ts:13
865+
#: src/language/generate.ts:14
861866
msgid "Check if the nginx.conf includes the conf.d directory"
862867
msgstr ""
863868

864-
#: src/language/generate.ts:14
869+
#: src/language/generate.ts:15
865870
msgid "Check if the nginx.conf includes the sites-enabled directory"
866871
msgstr ""
867872

868-
#: src/language/generate.ts:15
873+
#: src/language/generate.ts:16
869874
msgid "Check if the nginx.conf includes the streams-enabled directory"
870875
msgstr ""
871876

872-
#: src/language/generate.ts:16
877+
#: src/language/generate.ts:17
873878
msgid ""
874879
"Check if the sites-available and sites-enabled directories are under the "
875880
"nginx configuration directory"
876881
msgstr ""
877882

878-
#: src/language/generate.ts:17
883+
#: src/language/generate.ts:18
879884
msgid ""
880885
"Check if the streams-available and streams-enabled directories are under the "
881886
"nginx configuration directory"
@@ -988,6 +993,14 @@ msgstr ""
988993
msgid "Compression level, 1 is lowest, 9 is highest"
989994
msgstr ""
990995

996+
#: src/language/generate.ts:19
997+
msgid "Conf.d directory exists"
998+
msgstr ""
999+
1000+
#: src/constants/errors/self_check.ts:23
1001+
msgid "Conf.d directory not exists"
1002+
msgstr ""
1003+
9911004
#: src/views/preference/components/ExternalNotify/columns.tsx:58
9921005
msgid "Config"
9931006
msgstr ""
@@ -1528,7 +1541,7 @@ msgstr ""
15281541
msgid "Docker client not initialized"
15291542
msgstr ""
15301543

1531-
#: src/language/generate.ts:18
1544+
#: src/language/generate.ts:20
15321545
msgid "Docker socket exists"
15331546
msgstr ""
15341547

@@ -2039,7 +2052,7 @@ msgstr ""
20392052
msgid "Failed to delete certificate"
20402053
msgstr ""
20412054

2042-
#: src/language/generate.ts:19
2055+
#: src/language/generate.ts:21
20432056
msgid "Failed to delete certificate from database: %{error}"
20442057
msgstr ""
20452058

@@ -2209,7 +2222,7 @@ msgstr ""
22092222
msgid "Failed to revoke certificate"
22102223
msgstr ""
22112224

2212-
#: src/language/generate.ts:20
2225+
#: src/language/generate.ts:22
22132226
msgid "Failed to revoke certificate: %{error}"
22142227
msgstr ""
22152228

@@ -2846,7 +2859,7 @@ msgstr ""
28462859
msgid "Log"
28472860
msgstr ""
28482861

2849-
#: src/language/generate.ts:21
2862+
#: src/language/generate.ts:23
28502863
msgid ""
28512864
"Log file %{log_path} is not a regular file. If you are using nginx-ui in "
28522865
"docker container, please refer to https://nginxui.com/zh_CN/guide/config-"
@@ -3190,7 +3203,7 @@ msgstr ""
31903203
msgid "Nginx Access Log Path"
31913204
msgstr ""
31923205

3193-
#: src/language/generate.ts:23
3206+
#: src/language/generate.ts:25
31943207
msgid "Nginx access log path exists"
31953208
msgstr ""
31963209

@@ -3223,11 +3236,11 @@ msgstr ""
32233236
msgid "Nginx config directory is not set"
32243237
msgstr ""
32253238

3226-
#: src/language/generate.ts:24
3239+
#: src/language/generate.ts:26
32273240
msgid "Nginx configuration directory exists"
32283241
msgstr ""
32293242

3230-
#: src/language/generate.ts:25
3243+
#: src/language/generate.ts:27
32313244
msgid "Nginx configuration entry file exists"
32323245
msgstr ""
32333246

@@ -3265,7 +3278,7 @@ msgstr ""
32653278
msgid "Nginx Error Log Path"
32663279
msgstr ""
32673280

3268-
#: src/language/generate.ts:26
3281+
#: src/language/generate.ts:28
32693282
msgid "Nginx error log path exists"
32703283
msgstr ""
32713284

@@ -3306,7 +3319,7 @@ msgstr ""
33063319
msgid "Nginx PID Path"
33073320
msgstr ""
33083321

3309-
#: src/language/generate.ts:22
3322+
#: src/language/generate.ts:24
33103323
msgid "Nginx PID path exists"
33113324
msgstr ""
33123325

@@ -3339,7 +3352,7 @@ msgstr ""
33393352
msgid "Nginx restarted successfully"
33403353
msgstr ""
33413354

3342-
#: src/language/generate.ts:27
3355+
#: src/language/generate.ts:29
33433356
msgid "Nginx sbin path exists"
33443357
msgstr ""
33453358

@@ -3370,15 +3383,15 @@ msgid ""
33703383
"few seconds."
33713384
msgstr ""
33723385

3373-
#: src/language/generate.ts:28
3386+
#: src/language/generate.ts:30
33743387
msgid "Nginx.conf includes conf.d directory"
33753388
msgstr ""
33763389

3377-
#: src/language/generate.ts:29
3390+
#: src/language/generate.ts:31
33783391
msgid "Nginx.conf includes sites-enabled directory"
33793392
msgstr ""
33803393

3381-
#: src/language/generate.ts:30
3394+
#: src/language/generate.ts:32
33823395
msgid "Nginx.conf includes streams-enabled directory"
33833396
msgstr ""
33843397

@@ -4834,7 +4847,7 @@ msgstr ""
48344847
msgid "Site not found"
48354848
msgstr ""
48364849

4837-
#: src/language/generate.ts:31
4850+
#: src/language/generate.ts:33
48384851
msgid "Sites directory exists"
48394852
msgstr ""
48404853

@@ -5000,7 +5013,7 @@ msgstr ""
50005013
msgid "Stream not found"
50015014
msgstr ""
50025015

5003-
#: src/language/generate.ts:32
5016+
#: src/language/generate.ts:34
50045017
msgid "Streams directory exists"
50055018
msgstr ""
50065019

0 commit comments

Comments
 (0)