Adds readme to mkdocs.yml, removes property from project.yml.

Author: dooleymatt

mkdocs.yml

@@ -41,6 +41,7 @@ pages:
           - Release process: 'readme/release-process.md'
           - Release notes: 'scripts/release-notes/README.md'
         - Setting up continuous integration: 'readme/ci.md'
+        - Setting up SSO with SimpleSAMLphp: 'readme/simplesamlphp-setup.md'
         - Open source contribution: 'readme/os-contribution.md'
   - Troubleshooting & Support: 'readme/support.md'
   - Extending / Overriding BLT: 'readme/extending-blt.md'

phing/tasks/deploy.xml

@@ -84,11 +84,13 @@
     <phingcall target="target-hook:invoke">
       <property name="hook-name" value="post-deploy-build"/>
     </phingcall>
+
+    <available property="simplesamlphp" file="${blt.root}/settings/simplesamlphp.settings.php"/>
     <if>
-      <isset property="simplesamlphp"/>
-      <then>
-        <phingcall target="simplesamlphp:deploy:config"/>
-      </then>
+      <istrue value="${simplesamlphp}"/>
+        <then>
+          <phingcall target="simplesamlphp:deploy:config"/>
+        </then>
     </if>
   </target>
 

phing/tasks/setup.xml

@@ -62,11 +62,12 @@
   <target name="setup:build" description="Generates all required files for a full build. E.g., (re)builds docroot, etc."
           depends="setup:git-hooks, setup:drupal:settings, setup:behat, setup:composer:install, frontend">
 
+    <available property="simplesamlphp" file="${blt.root}/settings/simplesamlphp.settings.php"/>
     <if>
-      <isset property="simplesamlphp"/>
-      <then>
-        <phingcall target="simplesamlphp:build:config"/>
-      </then>
+      <istrue value="${simplesamlphp}"/>
+        <then>
+          <phingcall target="simplesamlphp:build:config"/>
+        </then>
     </if>
 
     <phingcall target="target-hook:invoke">

phing/tasks/simplesamlphp.xml

@@ -3,35 +3,40 @@
   <target name="simplesamlphp:init" description="Initializes SimpleSAMLphp for project.">
 
     <!-- Adds simplesamlphp_auth as a dependency. -->
-    <phingcall target="simplesamlphp:lib:init"/>
-
-    <!-- Copies the configuration templates from the library to a simplesamlphp directory located in the project root. -->
-    <phingcall target="simplesamlphp:config:init"/>
-
-    <!-- Sets a property in project.yml to let other targets know simplesamlphp is installed -->
-    <echo>Updating project.yml.</echo>
-    <exec dir="${repo.root}" command="drupal yaml:update:value project.yml simplesamlphp true" logoutput="true" checkreturn="true" passthru="true" level="info"/>
-
-    <!-- Copies a settings file used by the simplesamlphp_auth module to site's settings dir. -->
-    <phingcall target="simplesamlphp:settings"/>
-
-    <!-- Creates a symlink from the docroot to the web accessible library dir. -->
-    <echo>Creating a symbolic link from ${docroot}/simplesaml to web accessible directory in the simplesamlphp library</echo>
-    <symlink target="../vendor/simplesamlphp/simplesamlphp/www/" link="${docroot}/simplesaml" overwrite="true" />
-
-    <!-- Outputs a message to edit the new config files. -->
-    <phingcall target="simplesamlphp:init:complete"/>
-
+    <available property="simplesamlphp" file="${blt.root}/settings/simplesamlphp.settings.php"/>
+
+    <if>
+      <isfalse value="${simplesamlphp}"/>
+      <then>
+        <phingcall target="simplesamlphp:lib:init"/>
+
+        <!-- Copies the configuration templates from the library to a simplesamlphp directory located in the project root. -->
+        <phingcall target="simplesamlphp:config:init"/>
+
+        <!-- Copies a settings file used by the simplesamlphp_auth module to blt's settings dir. -->
+        <phingcall target="simplesamlphp:settings"/>
+
+        <!-- Creates a symlink from the docroot to the web accessible library dir. -->
+        <echo>Creating a symbolic link from ${docroot}/simplesaml to web accessible directory in the simplesamlphp library</echo>
+        <symlink target="../vendor/simplesamlphp/simplesamlphp/www/" link="${docroot}/simplesaml" overwrite="true" />
+
+        <!-- Outputs a message to edit the new config files. -->
+        <phingcall target="simplesamlphp:init:complete"/>
+      </then>
+      <else>
+        <echo>SimpleSAMLphp has already been initialized by BLT.</echo>
+      </else>
+    </if>
   </target>
 
   <!-- Adds simplesamlphp_auth as a dependency. -->
-  <target name="simplesamlphp:lib:init" unless="simplesamlphp" hidden="true">
+  <target name="simplesamlphp:lib:init" hidden="true">
     <echo>Adding SimpleSAMLphp Auth module as a dependency.</echo>
     <exec dir="${repo.root}" command="composer require drupal/simplesamlphp_auth:8.3.x-dev#283994f" logoutput="true" checkreturn="true" passthru="true" level="info"/>
   </target>
 
   <!-- Copies the configuration templates from the library to a simplesamlphp directory located in the project root. -->
-  <target name="simplesamlphp:config:init" unless="simplesamlphp" hidden="true">
+  <target name="simplesamlphp:config:init" hidden="true">
     <echo>Copying config files to ${repo.root}/simplesamlphp/config.</echo>
     <copy todir="${repo.root}/simplesamlphp/config" overwrite="false">
       <filelist dir="${repo.root}/vendor/simplesamlphp/simplesamlphp/config-templates" files="authsources.php, config.php"/>