Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
feudal
feudalClientInstaller
Commits
e5e8319e
Commit
e5e8319e
authored
Apr 17, 2020
by
marcus.hardt
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'support-yaml' into 'master'
add support for yaml See merge request
!1
parents
c5281a57
f3518ce2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
6 deletions
+38
-6
client_config_template.yaml
client_config_template.yaml
+30
-0
feudalClient.service
feudalClient.service
+1
-1
install.sh
install.sh
+7
-5
No files found.
client_config_template.yaml
0 → 100644
View file @
e5e8319e
feudal_backend_host
:
"
feudal.scc.kit.edu"
username
:
"
kit-client"
password
:
"
assword"
services
:
"
kitssh"
:
"
name"
:
"
KIT
Test
SSH"
"
description"
:
"
Private
Use
Only"
"
command"
:
"
ldf_adapter
--conf
/etc/feudal/ldf_adapter_devel_lsdf.conf"
"
contact_email"
:
"
m-ops@lists.kit.edu"
"
contact_description"
:
"
M-Team
Ops"
group_to_service_ids
:
"
/myExampleColab"
:
-
"
kitssh"
entitlement_to_service_ids
:
"
urn:geant:h-df.de:group:myExampleColab"
:
-
"
kitssh"
"
urn:geant:h-df.de:group:HDF"
:
-
"
kitssh"
"
urn:mace:egi.eu:aai.egi.eu:member@goc.egi.eu"
:
-
"
kitssh"
"
urn:mace:egi.eu:group:vo.indigo-datacloud.eu:role=member#aai.egi.eu"
:
-
"
kitssh"
"
urn:mace:egi.eu:group:EOSC-hub-access"
:
-
"
kitssh"
feudalClient.service
View file @
e5e8319e
...
...
@@ -7,7 +7,7 @@ Type=simple
;ExecStart=/home/feudal/bin/feudalClient --config=/etc/feudal/%i.json --debug-backend
;ExecStart=%h/bin/feudalClientDev --config=%h/configs/dev/%i.json --debug-backend
;ExecStart=/home/feudal/bin/feudalClient --config=/etc/feudal/%i.json --debug-backend
ExecStart
=
/home/feudal/bin/feudalClient --config=/etc/feudal/client_config.
json
--debug-scripts
ExecStart
=
/home/feudal/bin/feudalClient --config=/etc/feudal/client_config.
yaml
--debug-scripts
Restart
=
on-failure
RestartSec
=
30s
...
...
install.sh
View file @
e5e8319e
...
...
@@ -126,9 +126,9 @@ test -e ${ETC_CONFIG}/ldf_adapter.conf || {
popd
>
/dev/null
test
-e
${
ETC_CONFIG
}
/client_config.json
||
{
test
-e
${
ETC_CONFIG
}
/client_config_template.
json
||
{
echo
"Installing a template for client_config_template.
json
in
${
ETC_CONFIG
}
"
cp
client_config_template.
json
${
ETC_CONFIG
}
test
-e
${
ETC_CONFIG
}
/client_config_template.
yaml
||
{
echo
"Installing a template for client_config_template.
yaml
in
${
ETC_CONFIG
}
"
cp
client_config_template.
yaml
${
ETC_CONFIG
}
}
}
test
-e
${
ETC_CONFIG
}
/environment
||
{
...
...
@@ -144,8 +144,10 @@ chown -R ${USER} ${ETC_CONFIG}
echo
-e
"
\n
Installing / updating systemd service for
${
SYSD_SERVICE
}
"
test
-e
${
LIB_SYSD
}
/
${
SERVICE
}
.service
&&
{
diff
-q
${
SYSD_SERVICE
}
${
LIB_SYSD
}
>
/dev/null
||
{
echo
"Preparing systemd service for update"
rm
-f
${
LIB_SYSD
}
/
${
SERVICE
}
.service
echo
"The installed and the suggested systemd service files differ:"
diff
-Nu
${
SYSD_SERVICE
}
${
LIB_SYSD
}
# rm -f ${LIB_SYSD}/${SERVICE}.service
}
}
test
-e
${
LIB_SYSD
}
/
${
SERVICE
}
.service
||
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment