Skip to content

Commit ef8c954

Browse files
elibosleyzackspear
elibosley
and
zackspear
authored
fix: update configValid state to ineligible in var.ini and adjust rel… (#1268)
…ated tests - Changed `configValid` value from "yes" to "ineligible" in `var.ini`. - Updated tests in `emhttp.test.ts` and `var.test.ts` to reflect the new state. - Refactored `var.ts` to handle the new `configErrorState` logic based on `configValid`. - Adjusted `config.resolver.ts` to return the correct error state. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Enhanced configuration status reporting to indicate when settings are ineligible, improving clarity on configuration validity. - **Chores** - Updated recorded download times to maintain accurate logging. - Refined the installation process with streamlined dependency linkage and improved script readability. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Zack Spear <[email protected]>
1 parent 83ad12b commit ef8c954

File tree

13 files changed

+1686
-329
lines changed

13 files changed

+1686
-329
lines changed

‎api/dev/states/var.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ shareAvahiSMBModel="Xserve"
8787
shfs_logging="1"
8888
safeMode="no"
8989
startMode="Normal"
90-
configValid="yes"
90+
configValid="ineligible"
9191
joinStatus="Not joined"
9292
deviceCount="4"
9393
flashGUID="0000-0000-0000-000000000000"

‎api/src/__test__/store/modules/emhttp.test.ts‎

Lines changed: 156 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -949,160 +949,160 @@ test('After init returns values from cfg file for all fields', async () => {
949949
]
950950
`);
951951
expect(varState).toMatchInlineSnapshot(`
952-
{
953-
"bindMgt": false,
954-
"cacheNumDevices": NaN,
955-
"cacheSbNumDisks": NaN,
956-
"comment": "Dev Server",
957-
"configState": "yes",
958-
"configValid": true,
959-
"csrfToken": "0000000000000000",
960-
"defaultFsType": "xfs",
961-
"deviceCount": 4,
962-
"domain": "",
963-
"domainLogin": "Administrator",
964-
"domainShort": "",
965-
"enableFruit": "no",
966-
"flashGuid": "0000-0000-0000-000000000000",
967-
"flashProduct": "DataTraveler_3.0",
968-
"flashVendor": "KINGSTON",
969-
"fsCopyPrcnt": 0,
970-
"fsNumMounted": 0,
971-
"fsNumUnmountable": 0,
972-
"fsProgress": "Autostart disabled",
973-
"fsState": "Stopped",
974-
"fsUnmountableMask": "",
975-
"fuseDirectio": "auto",
976-
"fuseDirectioDefault": "auto",
977-
"fuseDirectioStatus": "default",
978-
"fuseRemember": "330",
979-
"fuseRememberDefault": "330",
980-
"fuseRememberStatus": "default",
981-
"fuseUseino": "yes",
982-
"hideDotFiles": false,
983-
"joinStatus": "Not joined",
984-
"localMaster": true,
985-
"localTld": "local",
986-
"luksKeyfile": "/tmp/unraid/keyfile",
987-
"maxArraysz": 30,
988-
"maxCachesz": 30,
989-
"mdColor": "green-blink",
990-
"mdNumDisabled": 1,
991-
"mdNumDisks": 4,
992-
"mdNumErased": 0,
993-
"mdNumInvalid": 1,
994-
"mdNumMissing": 0,
995-
"mdNumNew": 0,
996-
"mdNumStripes": 1280,
997-
"mdNumStripesDefault": 1280,
998-
"mdNumStripesStatus": "default",
999-
"mdQueueLimit": "80",
1000-
"mdQueueLimitDefault": "80",
1001-
"mdQueueLimitStatus": "default",
1002-
"mdResync": 0,
1003-
"mdResyncAction": "check P",
1004-
"mdResyncCorr": "0",
1005-
"mdResyncDb": "0",
1006-
"mdResyncDt": "0",
1007-
"mdResyncPos": 0,
1008-
"mdResyncSize": 438960096,
1009-
"mdScheduler": "auto",
1010-
"mdSchedulerDefault": "auto",
1011-
"mdSchedulerStatus": "default",
1012-
"mdState": "STOPPED",
1013-
"mdSyncLimit": "5",
1014-
"mdSyncLimitDefault": "5",
1015-
"mdSyncLimitStatus": "default",
1016-
"mdSyncThresh": NaN,
1017-
"mdSyncThreshDefault": NaN,
1018-
"mdSyncWindow": NaN,
1019-
"mdSyncWindowDefault": NaN,
1020-
"mdVersion": "2.9.14",
1021-
"mdWriteMethod": NaN,
1022-
"mdWriteMethodDefault": "auto",
1023-
"mdWriteMethodStatus": "default",
1024-
"name": "Tower",
1025-
"nrRequests": NaN,
1026-
"nrRequestsDefault": NaN,
1027-
"nrRequestsStatus": "default",
1028-
"ntpServer1": "time1.google.com",
1029-
"ntpServer2": "time2.google.com",
1030-
"ntpServer3": "time3.google.com",
1031-
"ntpServer4": "time4.google.com",
1032-
"pollAttributes": "1800",
1033-
"pollAttributesDefault": "1800",
1034-
"pollAttributesStatus": "default",
1035-
"port": 80,
1036-
"portssh": 22,
1037-
"portssl": 443,
1038-
"porttelnet": 23,
1039-
"queueDepth": "auto",
1040-
"regCheck": "Valid",
1041-
"regExp": "",
1042-
"regFile": "/app/dev/Unraid.net/Pro.key",
1043-
"regGen": "0",
1044-
"regGuid": "13FE-4200-C300-58C372A52B19",
1045-
"regState": "PRO",
1046-
"regTm": "1833409182",
1047-
"regTm2": "0",
1048-
"regTo": "Eli Bosley",
1049-
"regTy": "PRO",
1050-
"reservedNames": "parity,parity2,parity3,diskP,diskQ,diskR,disk,disks,flash,boot,user,user0,disk0,disk1,disk2,disk3,disk4,disk5,disk6,disk7,disk8,disk9,disk10,disk11,disk12,disk13,disk14,disk15,disk16,disk17,disk18,disk19,disk20,disk21,disk22,disk23,disk24,disk25,disk26,disk27,disk28,disk29,disk30,disk31",
1051-
"safeMode": false,
1052-
"sbClean": true,
1053-
"sbEvents": 173,
1054-
"sbName": "/boot/config/super.dat",
1055-
"sbNumDisks": 5,
1056-
"sbState": "1",
1057-
"sbSyncErrs": 0,
1058-
"sbSyncExit": "0",
1059-
"sbSynced": 1586819259,
1060-
"sbSynced2": 1586822456,
1061-
"sbUpdated": "1596079143",
1062-
"sbVersion": "2.9.13",
1063-
"security": "user",
1064-
"shareAvahiEnabled": true,
1065-
"shareAvahiSmbModel": "Xserve",
1066-
"shareAvahiSmbName": "%h",
1067-
"shareCacheEnabled": true,
1068-
"shareCacheFloor": "2000000",
1069-
"shareCount": 0,
1070-
"shareDisk": "yes",
1071-
"shareInitialGroup": "Domain Users",
1072-
"shareInitialOwner": "Administrator",
1073-
"shareMoverActive": false,
1074-
"shareMoverLogging": false,
1075-
"shareMoverSchedule": "40 3 * * *",
1076-
"shareNfsCount": 0,
1077-
"shareNfsEnabled": false,
1078-
"shareSmbCount": 1,
1079-
"shareSmbEnabled": true,
1080-
"shareSmbMode": "workgroup",
1081-
"shareUser": "e",
1082-
"shareUserExclude": "",
1083-
"shareUserInclude": "",
1084-
"shfsLogging": "1",
1085-
"shutdownTimeout": 90,
1086-
"spindownDelay": 0,
1087-
"spinupGroups": false,
1088-
"startArray": false,
1089-
"startMode": "Normal",
1090-
"startPage": "Main",
1091-
"sysArraySlots": 24,
1092-
"sysCacheSlots": NaN,
1093-
"sysFlashSlots": 1,
1094-
"sysModel": "Dell R710",
1095-
"timeZone": "Australia/Adelaide",
1096-
"useNetbios": "yes",
1097-
"useNtp": true,
1098-
"useSsh": true,
1099-
"useSsl": null,
1100-
"useTelnet": true,
1101-
"useUpnp": true,
1102-
"useWsd": "no",
1103-
"version": "6.11.2",
1104-
"workgroup": "WORKGROUP",
1105-
"wsdOpt": "",
1106-
}
1107-
`);
952+
{
953+
"bindMgt": false,
954+
"cacheNumDevices": NaN,
955+
"cacheSbNumDisks": NaN,
956+
"comment": "Dev Server",
957+
"configErrorState": "INELIGIBLE",
958+
"configValid": false,
959+
"csrfToken": "0000000000000000",
960+
"defaultFsType": "xfs",
961+
"deviceCount": 4,
962+
"domain": "",
963+
"domainLogin": "Administrator",
964+
"domainShort": "",
965+
"enableFruit": "no",
966+
"flashGuid": "0000-0000-0000-000000000000",
967+
"flashProduct": "DataTraveler_3.0",
968+
"flashVendor": "KINGSTON",
969+
"fsCopyPrcnt": 0,
970+
"fsNumMounted": 0,
971+
"fsNumUnmountable": 0,
972+
"fsProgress": "Autostart disabled",
973+
"fsState": "Stopped",
974+
"fsUnmountableMask": "",
975+
"fuseDirectio": "auto",
976+
"fuseDirectioDefault": "auto",
977+
"fuseDirectioStatus": "default",
978+
"fuseRemember": "330",
979+
"fuseRememberDefault": "330",
980+
"fuseRememberStatus": "default",
981+
"fuseUseino": "yes",
982+
"hideDotFiles": false,
983+
"joinStatus": "Not joined",
984+
"localMaster": true,
985+
"localTld": "local",
986+
"luksKeyfile": "/tmp/unraid/keyfile",
987+
"maxArraysz": 30,
988+
"maxCachesz": 30,
989+
"mdColor": "green-blink",
990+
"mdNumDisabled": 1,
991+
"mdNumDisks": 4,
992+
"mdNumErased": 0,
993+
"mdNumInvalid": 1,
994+
"mdNumMissing": 0,
995+
"mdNumNew": 0,
996+
"mdNumStripes": 1280,
997+
"mdNumStripesDefault": 1280,
998+
"mdNumStripesStatus": "default",
999+
"mdQueueLimit": "80",
1000+
"mdQueueLimitDefault": "80",
1001+
"mdQueueLimitStatus": "default",
1002+
"mdResync": 0,
1003+
"mdResyncAction": "check P",
1004+
"mdResyncCorr": "0",
1005+
"mdResyncDb": "0",
1006+
"mdResyncDt": "0",
1007+
"mdResyncPos": 0,
1008+
"mdResyncSize": 438960096,
1009+
"mdScheduler": "auto",
1010+
"mdSchedulerDefault": "auto",
1011+
"mdSchedulerStatus": "default",
1012+
"mdState": "STOPPED",
1013+
"mdSyncLimit": "5",
1014+
"mdSyncLimitDefault": "5",
1015+
"mdSyncLimitStatus": "default",
1016+
"mdSyncThresh": NaN,
1017+
"mdSyncThreshDefault": NaN,
1018+
"mdSyncWindow": NaN,
1019+
"mdSyncWindowDefault": NaN,
1020+
"mdVersion": "2.9.14",
1021+
"mdWriteMethod": NaN,
1022+
"mdWriteMethodDefault": "auto",
1023+
"mdWriteMethodStatus": "default",
1024+
"name": "Tower",
1025+
"nrRequests": NaN,
1026+
"nrRequestsDefault": NaN,
1027+
"nrRequestsStatus": "default",
1028+
"ntpServer1": "time1.google.com",
1029+
"ntpServer2": "time2.google.com",
1030+
"ntpServer3": "time3.google.com",
1031+
"ntpServer4": "time4.google.com",
1032+
"pollAttributes": "1800",
1033+
"pollAttributesDefault": "1800",
1034+
"pollAttributesStatus": "default",
1035+
"port": 80,
1036+
"portssh": 22,
1037+
"portssl": 443,
1038+
"porttelnet": 23,
1039+
"queueDepth": "auto",
1040+
"regCheck": "Valid",
1041+
"regExp": "",
1042+
"regFile": "/app/dev/Unraid.net/Pro.key",
1043+
"regGen": "0",
1044+
"regGuid": "13FE-4200-C300-58C372A52B19",
1045+
"regState": "PRO",
1046+
"regTm": "1833409182",
1047+
"regTm2": "0",
1048+
"regTo": "Eli Bosley",
1049+
"regTy": "PRO",
1050+
"reservedNames": "parity,parity2,parity3,diskP,diskQ,diskR,disk,disks,flash,boot,user,user0,disk0,disk1,disk2,disk3,disk4,disk5,disk6,disk7,disk8,disk9,disk10,disk11,disk12,disk13,disk14,disk15,disk16,disk17,disk18,disk19,disk20,disk21,disk22,disk23,disk24,disk25,disk26,disk27,disk28,disk29,disk30,disk31",
1051+
"safeMode": false,
1052+
"sbClean": true,
1053+
"sbEvents": 173,
1054+
"sbName": "/boot/config/super.dat",
1055+
"sbNumDisks": 5,
1056+
"sbState": "1",
1057+
"sbSyncErrs": 0,
1058+
"sbSyncExit": "0",
1059+
"sbSynced": 1586819259,
1060+
"sbSynced2": 1586822456,
1061+
"sbUpdated": "1596079143",
1062+
"sbVersion": "2.9.13",
1063+
"security": "user",
1064+
"shareAvahiEnabled": true,
1065+
"shareAvahiSmbModel": "Xserve",
1066+
"shareAvahiSmbName": "%h",
1067+
"shareCacheEnabled": true,
1068+
"shareCacheFloor": "2000000",
1069+
"shareCount": 0,
1070+
"shareDisk": "yes",
1071+
"shareInitialGroup": "Domain Users",
1072+
"shareInitialOwner": "Administrator",
1073+
"shareMoverActive": false,
1074+
"shareMoverLogging": false,
1075+
"shareMoverSchedule": "40 3 * * *",
1076+
"shareNfsCount": 0,
1077+
"shareNfsEnabled": false,
1078+
"shareSmbCount": 1,
1079+
"shareSmbEnabled": true,
1080+
"shareSmbMode": "workgroup",
1081+
"shareUser": "e",
1082+
"shareUserExclude": "",
1083+
"shareUserInclude": "",
1084+
"shfsLogging": "1",
1085+
"shutdownTimeout": 90,
1086+
"spindownDelay": 0,
1087+
"spinupGroups": false,
1088+
"startArray": false,
1089+
"startMode": "Normal",
1090+
"startPage": "Main",
1091+
"sysArraySlots": 24,
1092+
"sysCacheSlots": NaN,
1093+
"sysFlashSlots": 1,
1094+
"sysModel": "Dell R710",
1095+
"timeZone": "Australia/Adelaide",
1096+
"useNetbios": "yes",
1097+
"useNtp": true,
1098+
"useSsh": true,
1099+
"useSsl": null,
1100+
"useTelnet": true,
1101+
"useUpnp": true,
1102+
"useWsd": "no",
1103+
"version": "6.11.2",
1104+
"workgroup": "WORKGROUP",
1105+
"wsdOpt": "",
1106+
}
1107+
`);
11081108
});

0 commit comments

Comments
 (0)