Skip to content

Commit 018b708

Browse files
committed
fixes
1 parent 94b996a commit 018b708

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

certificates/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,16 @@ install-root-certificate: rootca.crt ## installs a certificate in the host syste
6666
echo "Is the DOCKER service ready? press when ready" && read -n 1; \
6767
fi;\
6868
echo "======================================";,\
69-
sudo cp $< /etc/ca-certificates/trust-source/anchors/osparc.crt; \
70-
sudo trust extract-compat && \
71-
echo "# restarting docker daemon" && \
69+
$(if $(IS_OSX), \
70+
sudo security add-trusted-cert -d -k /Library/Keychains/System.keychain $<; \
71+
echo "Please restart the DOCKER service now..." && read -n 1; \
72+
echo "Is the DOCKER service ready? press when ready" && read -n 1; \
73+
, \
74+
sudo cp $< /usr/local/share/ca-certificates/osparc.crt; \
75+
sudo update-ca-certificates -f; \
76+
echo "# restarting docker daemon"; \
7277
sudo systemctl restart docker \
78+
) \
7379
)
7480

7581

services/graylog/data/contentpacks/osparc-custom-content-pack-v2.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"v": "1",
3-
"id": "daaeea11-bde6-4203-9cfe-6ca2a23ca22e",
4-
"rev": 1,
5-
"name": "osparc-custom-content-pack-v3",
6-
"summary": "osparc-custom-content-pack-v3",
3+
"id": "dfaeea11-bde6-4203-9cfe-6ca2a23ca22e",
4+
"rev": 42,
5+
"name": "osparc-custom-content-pack-v2",
6+
"summary": "osparc-custom-content-pack-v2",
77
"description": "",
88
"vendor": "Osparc team",
99
"url": "",

0 commit comments

Comments
 (0)