Commit e5e8319e authored by marcus.hardt's avatar marcus.hardt

Merge branch 'support-yaml' into 'master'

add support for yaml

See merge request !1
parents c5281a57 f3518ce2
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"
......@@ -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
......
......@@ -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 "\nInstalling / 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 || {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment