Merge pull request #74 from ec-europa/develop

Small improvements to default values.

.gitignore

@@ -1,33 +1,18 @@
-# Ignore editor and IDE metadata.
-# -------------------------------
+# Ignore metadata from common editors and IDEs.
 *.sublime-project
 *.sublime-workspace
 .idea/
 nbproject/
 .DS_Store
 
 # Ignore local configuration.
-# ---------------------------
-/build.develop.props
-/build.default.props
-/build.project.xml
-/phpcs-ruleset.xml
-/phpcs.xml
-/tests/behat.yml
+build.develop.props
+tests/behat.yml
+tests/phpunit.xml
 
 # Ignore build artifacts.
-# -----------------------
-/bin/
-/toolkit
-/docker-*
-/build/
-/dist/
-/lib
-/resources
-/tests
-/platform/
-/.tmp/
-/vendor/
-/resources/git/hooks/pre-push/phpcs
-lib-backup/
+build
+/composer.lock
+.tmp
 toolkit
+vendor

includes/phing/props/main.props

@@ -1,4 +1,3 @@
-# -----------------------------------------------------------------------------------
 # The main properties of the toolkit. Most of them are build and development related.
 # -----------------------------------------------------------------------------------
 
@@ -21,7 +20,7 @@ project.name = My Project
 project.theme.default = ec_resp
 project.type = subsite
 project.url.base = http://web:8080
-project.url.production =
+project.url.production = https://ec.europa.eu/${project.id}
 
 # Development modules.
 # --------------------
@@ -32,7 +31,7 @@ devel.mdls.en = devel context field_ui maillog simpletest stage_file_proxy views
 # ----------------------
 devel.vars.error_level = 2
 devel.vars.stage_file_proxy_hotlink = 1
-devel.vars.stage_file_proxy_origin = https://ec.europa.eu/${project.id}
+devel.vars.stage_file_proxy_origin = ${project.url.production}
 devel.vars.stage_file_proxy_origin_dir = sites/${project.id}/files
 devel.vars.views_show_additional_queries = 1
 devel.vars.views_ui_show_performance_statistics = 1

includes/templates/subsite/build.project.props

@@ -1,4 +1,4 @@
-# Subsite configuration.
+4# Subsite configuration.
 # ----------------------
 project.id = toolkit
 project.install.modules =
@@ -16,4 +16,4 @@ project.admin.email = ${project.admin.username}@example.com
 # Platform configuration.
 # -----------------------
 profile = multisite_drupal_standard
-platform.package.version = 2.3
+platform.package.version = 2.4

includes/templates/subsite/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "ec-europa/subsite",
     "require": {
-        "ec-europa/toolkit": "3.0.*@beta"
+        "ec-europa/toolkit": "3.*"
     },
     "scripts": {
         "post-install-cmd": "@toolkit-install",