Updates for grisp_connect 2.0.0

Author: ziopio

.github/workflows/erlang.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        otp: ['27.1']
+        otp: ['27.2.4']
         rebar3: ['3.24.0']
     steps:
     - uses: erlef/setup-beam@v1

config/sys.config

@@ -1,27 +1,39 @@
 [
     {kernel, [
-        % Disable 'default' handler (which buffers all log events in logger).
-        {logger, [{handler, default, undefined}]}
-    ]},
-    {grisp_connect, [
+        {logger_level, notice},
         {logger, [
-            % Enable the grisp_connect handler as default,
-            % so that it will receive all events from boot
-            {handler,
-             default, % name
-             grisp_connect_logger_bin, % module
-             #{
-                formatter => {grisp_connect_logger_bin, #{
-                    % To see logs printed on the USB serial appoint a logger
-                    % formatter module of your choice and set the stdout
-                    % configuration stdout => {Formatter, FormatterConfig}
-                    stdout => {logger_formatter, #{}}
-                }}
+            {handler, default, logger_std_h, #{
+                level => notice,
+                filter_default => log,
+                filters => [
+                    % Filter out supervisor progress reports so TLS certificates
+                    % are not swamping the console if level is set to info...
+                    {disable_progress, {fun logger_filters:progress/2, stop}}
+                ]
+            }},
+            {handler, grisp_connect_log_handler,  grisp_connect_logger_bin, #{
+                level => notice,
+                filter_default => log,
+                formatter => {grisp_connect_logger_bin, #{}},
+                filters => [
+                    % Filter out supervisor progress reports so TLS certificates
+                    % are not swamping grisp.io if level is set to info...
+                    {disable_progress, {fun logger_filters:progress/2, stop}}
+                ]
              }
             }
         ]}
     ]},
+    {grisp_connect, [
+        {ntp, true},
+        % Disable the log handler defined in grisp_connect application default
+        % configuration, as it was explicitly started in kernel configuration
+        % in order to catch the log entries before grisp_connect is started.
+        {logger, []}
+    ]},
     {grisp_updater, [
+        {signature_check, false},
+        {signature_certificates, {priv, grisp_demo, "certificates/updates"}},
         {system, {grisp_updater_grisp2, #{}}},
         {sources, [
             {grisp_updater_tarball, #{}},

grisp/grisp2/common/deploy/files/etc/hosts

@@ -17,8 +17,10 @@
     %     {toolchain, [{directory, "..."}]}
     % ]},
     {deploy, [
-        {pre_script, "mkdir -p _deploy"},
-        {destination, "_deploy"}
+        {pre_script, "rm -rf /Volumes/GRISP/*"},
+        {destination, "/Volumes/GRISP"},
+        {post_script, "diskutil umount /Volumes/GRISP"}
+
     ]}
 ]}.
 

rebar.config

@@ -5,12 +5,13 @@
   {git,"https://github.com/erlang/epmd",
        {ref,"4d1a595b9d5c32fc0e55f462da381de62de23bf0"}},
   0},
- {<<"grisp">>,{pkg,<<"grisp">>,<<"2.7.0">>},1},
- {<<"grisp_connect">>,{pkg,<<"grisp_connect">>,<<"1.1.0">>},0},
- {<<"grisp_cryptoauth">>,{pkg,<<"grisp_cryptoauth">>,<<"2.4.0">>},1},
- {<<"grisp_updater">>,{pkg,<<"grisp_updater">>,<<"2.1.0">>},1},
- {<<"grisp_updater_grisp2">>,{pkg,<<"grisp_updater_grisp2">>,<<"0.2.0">>},0},
+ {<<"grisp">>,{pkg,<<"grisp">>,<<"2.8.0">>},1},
+ {<<"grisp_connect">>,{pkg,<<"grisp_connect">>,<<"2.0.0">>},0},
+ {<<"grisp_cryptoauth">>,{pkg,<<"grisp_cryptoauth">>,<<"2.4.1">>},1},
+ {<<"grisp_updater">>,{pkg,<<"grisp_updater">>,<<"2.1.1">>},1},
+ {<<"grisp_updater_grisp2">>,{pkg,<<"grisp_updater_grisp2">>,<<"0.2.1">>},0},
  {<<"gun">>,{pkg,<<"gun">>,<<"2.1.0">>},1},
+ {<<"jarl">>,{pkg,<<"jarl">>,<<"1.0.1">>},1},
  {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},1},
  {<<"mapz">>,{pkg,<<"mapz">>,<<"2.4.0">>},2},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},3},
@@ -20,12 +21,13 @@
 {pkg_hash,[
  {<<"certifi">>, <<"E52BE248590050B2DD33B0BB274B56678F9068E67805DCA8AA8B1CCDB016BBF6">>},
  {<<"cowlib">>, <<"DB8F7505D8332D98EF50A3EF34B34C1AFDDEC7506E4EE4DD4A3A266285D282CA">>},
- {<<"grisp">>, <<"66EC41E78738A7772F661B2B04102177C3CA26FEA8C049EABCA8BD0CCD0C721B">>},
- {<<"grisp_connect">>, <<"84BC68029950C3CC9948ED95D36C05B48DDD0544635C74C697DDAA40225BEBF0">>},
- {<<"grisp_cryptoauth">>, <<"60773DFCB597893A1E98BFE2974A74C277D9FF6CE16BD918BFD906D43AAB86C0">>},
- {<<"grisp_updater">>, <<"9D826A1EA6EA72F084780CD28DCC3421B90256BDEF73FE53451ECE135CEE57AD">>},
- {<<"grisp_updater_grisp2">>, <<"9A175CF3B4D68D12FD9A601397F82203B57FCFCBAAE366D633327F4BB9E5A914">>},
+ {<<"grisp">>, <<"E0B7D4C3464702DBD62A867EDE76488226B0772B29DF7DBAE4E08E474F2B81F5">>},
+ {<<"grisp_connect">>, <<"C1D13AE84D17CB19425DB941337085FA4E654EE126C1B5C60F8E552EE841D5A5">>},
+ {<<"grisp_cryptoauth">>, <<"AA623B135F000E03DBA0FCBB64C08B5F31E29B1DAC2B4E7A106BAFCA3878141C">>},
+ {<<"grisp_updater">>, <<"471744D14F756ED0DF22414EA752A9E943EC0CB996E1596F708DCA52D2F9C527">>},
+ {<<"grisp_updater_grisp2">>, <<"15E0688465C9CD7FE24A4CF47E48FD939B51B175EC74BDD4BF8B33417E8CACC3">>},
  {<<"gun">>, <<"B4E4CBBF3026D21981C447E9E7CA856766046EFF693720BA43114D7F5DE36E87">>},
+ {<<"jarl">>, <<"B92ECC182498C33E9ED31DF7A0EF4BECAFAC0E1CB1C118C618E662BCC45CE7E9">>},
  {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>},
  {<<"mapz">>, <<"77A8E38B69BAB16C5D3EBD44E6C619F8AF1F1598B0CAAE301D266605A0865756">>},
  {<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
@@ -34,12 +36,13 @@
 {pkg_hash_ext,[
  {<<"certifi">>, <<"8F3D9533A0F06070AFDFD5D596B32E21C6580667A492891851B0E2737BC507A1">>},
  {<<"cowlib">>, <<"E1E1284DC3FC030A64B1AD0D8382AE7E99DA46C3246B815318A4B848873800A4">>},
- {<<"grisp">>, <<"4895B22DAA820B7671923FC137163E4F39A59A97005E2E48F1B9FE38E39069E0">>},
- {<<"grisp_connect">>, <<"CF3082AB003659E9010B04AF1A6C94AA7D50C351D7BD5C3D544BA08EF099EB12">>},
- {<<"grisp_cryptoauth">>, <<"D9BD51BC877986404FCF6DB1E3DF196C919BD6F55398FA03262D1C4323410AB9">>},
- {<<"grisp_updater">>, <<"C092090DB0CC6D82432732BD9536D63C2DA7C4AF477EFC2EE3FACABC15F8528F">>},
- {<<"grisp_updater_grisp2">>, <<"E52A6484BA9F17309DBB424A7C2AAF30D854F79A03F47DFAF57EF6D87A531B74">>},
+ {<<"grisp">>, <<"4BF7D6E31B03884C13402694D8CDC9B5ECADB53EA1B405453581FD2248D38928">>},
+ {<<"grisp_connect">>, <<"C5D21F2CC998688F5217FD4684F4345718F8685B5015B1CE0079A3E8E44AFD42">>},
+ {<<"grisp_cryptoauth">>, <<"A3B997EB54C6FC96B9FFCBB6207F453CD28CD86B4B44D4A6DE703174B4AAE065">>},
+ {<<"grisp_updater">>, <<"00B114255B84F85B71E95C5BD05C42D4C2F64839819DF3BA78B1FB6F2AB01A6E">>},
+ {<<"grisp_updater_grisp2">>, <<"4927ECA45BC98E7D49050737C6885E7C5CD86CD634317FE4B14BC1EBE9F843C1">>},
  {<<"gun">>, <<"52FC7FC246BFC3B00E01AEA1C2854C70A366348574AB50C57DFE796D24A0101D">>},
+ {<<"jarl">>, <<"6786787231E0E966BB01B30EEFEC353D6760F5C490B419A126726AFB46BB1437">>},
  {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>},
  {<<"mapz">>, <<"4B68DF5CF0522E0D6545DF7B681BC052865CDB78405AD4CC9C55FE45EE7B25BE">>},
  {<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},