Merge pull request #81 from ec-europa/develop

Release 3.0.5 - Small improvements and bugfix
ec-europa · Feb 19, 2018 · 5f813ca · 5f813ca
2 parents 7e05511 + 1f9c8c6
commit 5f813ca
Show file tree

Hide file tree

Showing 19 changed files with 158 additions and 167 deletions.
diff --git a/LICENSE → LICENSE.txt b/LICENSE → LICENSE.txt
diff --git a/build.default.props b/build.default.props
@@ -230,11 +230,12 @@ db.url = ${db.type}://${db.user}:${db.password}@${db.host}:${db.port}/${db.name}
 # Solr configuration.
 # -------------------
 solr.enable = 1
-solr.host = solr
+solr.scheme = http
+solr.host = localhost
 solr.port = 8983
+solr.path = /solr
 solr.type = d7_apachesolr
-solr.scheme = http
-solr.url = ${solr.scheme}://${solr.host}:${solr.port}/solr/${solr.type}
+solr.url = ${solr.scheme}://${solr.host}:${solr.port}${solr.path}/${solr.type}
 
 # Admin configuration.
 # --------------------

diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "ec-europa/toolkit",
     "description": "NextEuropa Toolkit packaged for composer",
+    "license": "EUPL-1.1",
     "scripts": {
         "toolkit-install": "PROJECT=${PROJECT} composer install --working-dir=includes/composer --ignore-platform-reqs --no-suggest --ansi",
         "toolkit-update": "PROJECT=${PROJECT} composer update --working-dir=includes/composer  --ignore-platform-reqs --no-suggest --ansi",

diff --git a/docs/configuring-project.md b/docs/configuring-project.md
@@ -249,11 +249,12 @@ db.url = ${db.type}://${db.user}:${db.password}@${db.host}:${db.port}/${db.name}
 # Solr configuration.
 # -------------------
 solr.enable = 1
-solr.host = solr
+solr.scheme = http
+solr.host = localhost
 solr.port = 8983
+solr.path = /solr
 solr.type = d7_apachesolr
-solr.scheme = http
-solr.url = ${solr.scheme}://${solr.host}:${solr.port}/solr/${solr.type}
+solr.url = ${solr.scheme}://${solr.host}:${solr.port}${solr.path}/${solr.type}
 
 # Admin configuration.
 # --------------------

diff --git a/includes/drush/generate-settings.php b/includes/drush/generate-settings.php
@@ -30,7 +30,7 @@
 // Set update free access.
 $settings['update_free_access'] = array(
     'required' => TRUE,
-    'value' => '%%update_free_access%%',
+    'value' => %%update_free_access%%,
 );
 
 // Set drupal hash salt.

diff --git a/includes/phing/build/help.xml b/includes/phing/build/help.xml
@@ -10,6 +10,11 @@
     <import file="${phing.dir.help}/help/github.xml" />
     <import file="${phing.dir.help}/help/toolkit.xml" />
 
+    <import file="${phing.dir.help}/main/subsite.xml" />
+    <import file="${phing.dir.help}/main/project.xml" />
+    <import file="${phing.dir.help}/main/platform.xml" />
+    <import file="${phing.dir.help}/main/theme.xml" />
+
     <!-- Check if site exists. -->
     <if>
         <available file="${build.settings.dir}/settings.php" type="file" />

diff --git a/includes/phing/build/help/drush.xml b/includes/phing/build/help/drush.xml
@@ -2,7 +2,7 @@
 
 <project name="drush" description="Contains drush helper targets that help manage your Drupal installation." default="">
 
-    <target name="drush-aliases-generate" description="Generate drush aliases for each subsite folder.">
+    <target name="drush-aliases-generate" hidden="true" description="Generate drush aliases for each subsite folder.">
         <mkdir dir="${build.platform.dir.sites}/all/drush" />
         <drushgal siteRoot="${build.platform.dir}" />
     </target>
@@ -44,10 +44,10 @@
             verbose="${drush.verbose}"
             color="${drush.color}">
             <param>all</param>
-        </drush>        
+        </drush>
     </target>
 
-    <target name="drush-files-dirs-htaccess" description="Ensure the presence of htaccess files.">
+    <target name="drush-files-dirs-htaccess" hidden="true" description="Ensure the presence of htaccess files.">
         <drush
             command="php-eval"
             assume="yes"
@@ -94,11 +94,11 @@
         </if>
     </target>
 
-    <target name="drush-make-secure" description="Check make file for insecure modules.">
+    <target name="drush-make-secure" hidden="true" description="Check make file for insecure modules.">
         <drushms makefile="${makefile-path}" failon="revoked" />
     </target>
 
-    <target name="drush-make-secure-all" description="Check all make files for insecure modules.">
+    <target name="drush-make-secure-all" hidden="true" description="Check all make files for insecure modules.">
         <echo msg="Checking make files for projects not covered by Drupal's security advisory." />
         <foreach param="makefile" absparam="makefile-path" target="drush-make-secure">
             <fileset dir="${resources.dir}">
@@ -120,7 +120,7 @@
         </drush>
     </target>
 
-    <target name="drush-node-access-rebuild" description="Rebuild the node access.">
+    <target name="drush-node-access-rebuild" hidden="true" description="Rebuild the node access.">
         <drush
             command="php-eval"
             assume="yes"
@@ -133,7 +133,7 @@
         </drush>
     </target>
 
-    <target name="drush-registry-rebuild" description="Perform a registry rebuild.">
+    <target name="drush-registry-rebuild" hidden="true" description="Perform a registry rebuild.">
         <trycatch>
             <try>
                 <exec command="${toolkit.dir.bin.drush} rr --help" checkreturn="true" />
@@ -149,7 +149,7 @@
         </trycatch>
     </target>
 
-    <target name="drush-registry-rebuild-dl" description="Download drush registry-rebuild.">
+    <target name="drush-registry-rebuild-dl" hidden="true" description="Download drush registry-rebuild.">
         <echo message="Installing registry rebuild on user account." />
         <exec command="${toolkit.dir.bin.drush} pm-download registry_rebuild-7 -n >/dev/null" />
         <exec command="${toolkit.dir.bin.drush} cc drush >/dev/null" />
@@ -191,7 +191,7 @@
         </drush>
     </target>
 
-    <target name="drush-site-install" description="Install a site.">
+    <target name="drush-site-install" hidden="true" description="Install a site.">
         <echo message="Installing site ${project.name}." />
         <drush command="site-install" assume="yes" root="${build.platform.dir}" bin="${toolkit.dir.bin.drush}" alias="@${drush.alias.default}" verbose="${drush.verbose}" color="${drush.color}">
             <option name="db-url" value="${db.url}" />
@@ -206,7 +206,7 @@
         <phingcall target="drush-settings-generate" />
     </target>
 
-    <target name="drush-solr-enable" description="Enable the solr module.">
+    <target name="drush-solr-enable" hidden="true" description="Enable the solr module.">
         <if>
             <equals arg1="${solr.enable}" arg2="1" />
             <then>
@@ -222,14 +222,14 @@
         </if>
     </target>
 
-    <target name="drush-sql-create" description="Create a database.">
+    <target name="drush-sql-create" hidden="true" description="Create a database.">
         <echo message="Creating database ${db.name}." />
         <drush command="sql-create" assume="yes" root="${build.platform.dir}" alias="@${drush.alias.default}" bin="${toolkit.dir.bin.drush}" verbose="${drush.verbose}" color="${drush.color}">
             <option name="db-url" value="${db.url}" />
         </drush>
     </target>
 
-    <target name="drush-sql-import" description="Import a database.">
+    <target name="drush-sql-import" hidden="true" description="Import a database.">
         <echo message="Importing database." />
         <phingcall target="drush-files-dirs-create" />
         <drush command="sql-cli" root="${build.platform.dir}" alias="@${drush.alias.default}" bin="${toolkit.dir.bin.drush}" verbose="${drush.verbose}" color="${drush.color}">
@@ -244,14 +244,14 @@
         </drush>
     </target>
 
-    <target name="drush-sql-drop" description="Drop a database.">
+    <target name="drush-sql-drop" hidden="true" description="Drop a database.">
         <echo message="Dropping database ${db.name}." />
         <drush command="sql-drop" assume="yes" root="${build.platform.dir}" alias="@${drush.alias.default}" bin="${toolkit.dir.bin.drush}" verbose="${drush.verbose}" color="${drush.color}">
             <option name="db-url" value="${db.url}" />
         </drush>
     </target>
 
-    <target name="drush-sql-dump" description="Make a dump of database.">
+    <target name="drush-sql-dump" hidden="true" description="Make a dump of database.">
         <echo message="Backing up database ${db.name} to ${database-file}." />
         <dirname property="database-cachedir" file="${database-file}" />
         <mkdir dir="${database-cachedir}" />

diff --git a/includes/phing/build/help/general.xml b/includes/phing/build/help/general.xml
@@ -9,7 +9,7 @@
         <echo msg="Finished clearing all caches." />
     </target>
 
-    <target name="cache-clear-global" description="Delete all files stored in global cache.">
+    <target name="cache-clear-global" hidden="true" description="Delete all files stored in global cache.">
         <if>
             <available file="${share.path.global}" type="dir" />
             <then>
@@ -20,7 +20,7 @@
         </if>
     </target>
 
-    <target name="cache-clear-local" description="Delete all files stored in local cache.">
+    <target name="cache-clear-local" hidden="true" description="Delete all files stored in local cache.">
         <if>
             <available file="${project.tmp.dir}" type="dir" />
             <then>
@@ -152,41 +152,18 @@
         </trycatch>
     </target>
 
-    <target name="reset-filesystem-permissions" description="Reset filesystem permissions." hidden="true">
+    <target name="reset-filesystem-permissions" description="Reset filesystem permissions for local/ephemeral use." hidden="true">
         <if>
-            <available file="${target-dir}" type="dir" />
+            <available file="${build.subsite.dir}" type="dir" />
             <then>
-                <chmod mode="0750" failonerror="true" verbose="false" quiet="true">
-                    <fileset dir="${target-dir}" excludes="**/sites/*/files">
-                        <type type="dir" />
-                    </fileset>
-                </chmod>
-                <chmod mode="0640" failonerror="true" verbose="false" quiet="true">
-                    <fileset dir="${target-dir}" excludes="**/sites/*/files">
-                        <type type="file" />
-                    </fileset>
-                </chmod>
-                <if>
-                    <not>
-                        <and>
-                            <contains string="${target-dir}" substring="${lib.dir}" />
-                            <contains string="${target-dir}" substring="${build.dist.dir}" />
-                        </and>
-                    </not>
-                    <then>
-                        <chmod mode="0770" failonerror="true" verbose="false" quiet="true">
-                            <fileset dir="${target-dir}" includes="**/sites/*/files">
-                                <type type="dir" />
-                            </fileset>
-                        </chmod>
-                        <chmod mode="0660" failonerror="true" verbose="false" quiet="true">
-                            <fileset dir="${target-dir}" includes="**/sites/*/files">
-                                <type type="file" />
-                            </fileset>
-                        </chmod>
-                    </then>
-                </if>
+                <echo msg="${build.subsite.dir} folder found, enforce folder permission reset." />
+                <exec command="chmod -R 777 ${build.subsite.dir}" />
+                <exec command="chmod 755 ${build.subsite.dir}" />
+                <exec command="chmod 444 ${build.subsite.dir}/settings.php" />
             </then>
+            <else>
+                <echo msg="${build.platform.dir} folder not found, skipping permission reset." />
+            </else>
         </if>
     </target>
 

diff --git a/includes/phing/build/help/github.xml b/includes/phing/build/help/github.xml
@@ -2,7 +2,7 @@
 
 <project name="github" description="Contains phing targets for github." default="">
 
-    <target name="github-auth" description="Authenticate on GitHub.">
+    <target name="github-auth" hidden="true" description="Authenticate on GitHub.">
         <if>
             <or>
                 <equals arg1="${github.auth}" arg2="http-toekn" />
@@ -22,7 +22,7 @@
         </if>
     </target>
 
-    <target name="github-create-release" description="Create release on GitHub."
+    <target name="github-create-release" hidden="true" description="Create release on GitHub."
         depends="
             github-auth,
             github-init">
@@ -32,7 +32,7 @@
             releaseId="release" />
     </target>
 
-    <target name="github-create-release-assets" description="Upload release assets to github."
+    <target name="github-create-release-assets" hidden="true" description="Upload release assets to github."
         depends="
             github-auth,
             github-init,
@@ -44,7 +44,7 @@
         </gh-create-assets>
     </target>
 
-    <target name="github-init" description="Initialize credentials and target."
+    <target name="github-init" hidden="true" description="Initialize credentials and target."
         depends="
             github-init-owner,
             github-init-repo" />