Merge pull request #84 from italia/83-import-keys-from-enviroments-er…

…rors

fix enviroment's name and echo

README.md

@@ -173,8 +173,8 @@ You can override the configuration of the proxy by settings one or more of the f
 |**$SATOSA_ENCRYPTION_KEY**|encription key for state|"CHANGE_ME!"|
 |**$SATOSA_SALT**|encription salt|"CHANGE_ME!"|
 |**$SATOSA_DISCO_SRV**|Descovery page URL for all backends|"https://$HOSTNAME/static/disco.html"|
-|**$SATOSA_PRIVATE_KEYS**|private key for SAML2 / SPID backends||
-|**$SATOSA_PUBLIC_KEYS**|public key for SAML2 / SPID backends||
+|**$SATOSA_PRIVATE_KEY**|private key for SAML2 / SPID backends||
+|**$SATOSA_PUBLIC_KEY**|public key for SAML2 / SPID backends||
 |**$MONGODB_USERNAME**|MongoDB username for oidc_op frontend, default from .env file in compose-Satosa-Saml2Spid||
 |**$MONGODB_PASSWORD**|MongoDB password for oidc_op frontend, default from .env file in compose-Satosa-Saml2Spid||
 |**$SATOSA_UNKNOW_ERROR_REDIRECT_PAGE**|redirect page for unknow erros|"https://$HOSTNAME/static/error_page.html"|

compose-Satosa-Saml2Spid/README.md

@@ -158,7 +158,7 @@ In the [project readme](../README.md#configuration-by-environments) is present a
       # - SATOSA_ORGANIZATION_NAME_IT=Resource provided by Example Organization
       # - SATOSA_ORGANIZATION_URL_EN=https://example_organization.org
       # - SATOSA_ORGANIZATION_URL_IT=https://example_organization.org
-      # - SATOSA_PRIVATE_KEYS=
+      # - SATOSA_PRIVATE_KEY=
       # - SATOSA_PUBLIC_KEY=
       # - SATOSA_SALT=
       # - SATOSA_STATE_ENCRYPTION_KEY

compose-Satosa-Saml2Spid/docker-compose.yml

@@ -52,7 +52,7 @@ services:
       # - SATOSA_ORGANIZATION_NAME_IT=Resource provided by Example Organization
       # - SATOSA_ORGANIZATION_URL_EN=https://example_organization.org
       # - SATOSA_ORGANIZATION_URL_IT=https://example_organization.org
-      # - SATOSA_PRIVATE_KEYS=
+      # - SATOSA_PRIVATE_KEY=
       # - SATOSA_PUBLIC_KEY=
       # - SATOSA_SALT=
       # - SATOSA_STATE_ENCRYPTION_KEY

example/run.sh

@@ -164,8 +164,8 @@ fi
 
 # import satosa keys with $SATOSA_PUBLIC_KEY and $SATOSA_PRIVATE_KEY, both must be present
 if [[ -v SATOSA_PRIVATE_KEY && -v SATOSA_PUBLIC_KEY ]]; then
-  echo $SATOSA_PRIVATE_KEYS > pki/privkey.pem
-  echo $SATOSA_PUBLIC_KEY > pki/cert.pem
+  echo "$SATOSA_PRIVATE_KEY" > pki/privkey.pem
+  echo "$SATOSA_PUBLIC_KEY" > pki/cert.pem
   echo "Satosa keys imported"
 else
   echo "satosa has loaded default keys"