Merge pull request #408 from CarlSchwan/fix-sso

Author: juliusknorr

docker-compose.yml

@@ -41,6 +41,7 @@ services:
           - stable30${DOMAIN_SUFFIX}
           - stable31${DOMAIN_SUFFIX}
           - mail${DOMAIN_SUFFIX}
+          - sso${DOMAIN_SUFFIX}
           - imap${DOMAIN_SUFFIX}
           - collabora${DOMAIN_SUFFIX}
           - codedev${DOMAIN_SUFFIX}

docker/configs/var-simplesamlphp/config/config.php

@@ -21,7 +21,7 @@
      * external url, no matter where you come from (direct access or via the
      * reverse proxy).
      */
-    'baseurlpath' => 'https://sso.local.dev.bitgrid.net/simplesaml/',
+    'baseurlpath' => 'https://sso.local/simplesaml/',
     'certdir' => 'cert/',
     'loggingdir' => 'log/',
     'datadir' => 'data/',

docker/configs/var-simplesamlphp/metadata/saml20-sp-remote.php

@@ -1,6 +1,6 @@
 <?php
-$metadata['https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml/metadata'] = array (
-    'entityid' => 'https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml/metadata',
+$metadata['https://nextcloud.local/index.php/apps/user_saml/saml/metadata'] = array (
+    'entityid' => 'https://nextcloud.local/index.php/apps/user_saml/saml/metadata',
     'contacts' => 
     array (
     ),
@@ -11,7 +11,7 @@
       0 => 
       array (
         'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-        'Location' => 'https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml/acs',
+        'Location' => 'https://nextcloud.local/index.php/apps/user_saml/saml/acs',
         'index' => 1,
       ),
     ),
@@ -20,7 +20,7 @@
       0 => 
       array (
         'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-        'Location' => 'https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml/sls',
+        'Location' => 'https://nextcloud.local/index.php/apps/user_saml/saml/sls',
       ),
     ),
     'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified',
@@ -36,4 +36,4 @@
     ),
     'validate.authnrequest' => false,
     'saml20.sign.assertion' => false,
-  );
+  );

docs/services/sso.md

@@ -16,9 +16,9 @@ docker compose up -d proxy nextcloud saml
 ```
 
 - uid mapping: `urn:oid:0.9.2342.19200300.100.1.1`
-- idp entity id: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/metadata.php`
-- Single Sign-On (SSO) service url: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/SSOService.php`
-- single log out service url: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/SingleLogoutService.php`
+- idp entity id: `https://sso.local/simplesaml/saml2/idp/metadata.php`
+- Single Sign-On (SSO) service url: `https://sso.local/simplesaml/saml2/idp/SSOService.php`
+- single log out service url: `https://sso.local/simplesaml/saml2/idp/SingleLogoutService.php`
 - use certificate from `docker/configs/var-simplesamlphp/cert/example.org.crt`
 
   ```