From 3e2d6b59fb40d24ba5b42867708297ee3b0f2cf5 Mon Sep 17 00:00:00 2001
From: Joao Santos <jonhy81@gmail.com>
Date: Mon, 29 Jan 2018 10:39:00 +0100
Subject: [PATCH 1/4] MULTISITE-18724: Clean and simplify default gitignore
 file.

---
 .gitignore | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf2bfe02c..8844f76f8 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-# Ignore editor and IDE metadata.
-# -------------------------------
+# Ignore metadata from common editors and IDEs.
 *.sublime-project
 *.sublime-workspace
 .idea/
@@ -7,27 +6,13 @@ 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

From 235236730dc7469066d23e298d665355af8ab15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Santos?= <jonhy81@gmail.com>
Date: Tue, 30 Jan 2018 15:15:47 +0100
Subject: [PATCH 2/4] Update subsite template

---
 includes/templates/subsite/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/templates/subsite/composer.json b/includes/templates/subsite/composer.json
index 5affc6a4d..9cbe6b617 100755
--- a/includes/templates/subsite/composer.json
+++ b/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",

From 3aa38c23e826bdacae1ca9e1aa64a096036c12dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Santos?= <jonhy81@gmail.com>
Date: Tue, 30 Jan 2018 15:16:09 +0100
Subject: [PATCH 3/4] Update build.project.props

---
 includes/templates/subsite/build.project.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/templates/subsite/build.project.props b/includes/templates/subsite/build.project.props
index 20981a14a..f976d1022 100755
--- a/includes/templates/subsite/build.project.props
+++ b/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

From 1b3ad2cda83c72fae6b0d289a1a99c93a2aa8cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Santos?= <jonhy81@gmail.com>
Date: Tue, 30 Jan 2018 15:17:57 +0100
Subject: [PATCH 4/4] Alter default values for file_stage_proxy and production
 url.

---
 includes/phing/props/main.props | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/includes/phing/props/main.props b/includes/phing/props/main.props
index 6a60b691a..4122fbfb5 100755
--- a/includes/phing/props/main.props
+++ b/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