Commit 8f2416bf authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'task/new-server-2' into 'develop'

Configuration for new server

See merge request !474
parents b522fa8b f4f05f1e
Pipeline #8670 passed with stages
in 7 minutes and 38 seconds
......@@ -14,11 +14,10 @@ stages:
variables:
GIT_STRATEGY: "none"
GIT_SSL_NO_VERIFY: "true"
STAGE_PORT: 22200
STAGE_HOST: "extensions-stage.typo3.org"
STAGE_HOST: "extensions.typo3.dev"
PRODUCTION_PORT: 22201
PRODUCTION_HOST: "extensions.typo3.org"
DUMP_USER: "extensionsstage"
STAGE_USER: "extensions-stage"
DUMP_EXCLUDE_TABLES_LIST: "be_groups,be_sessions,be_users,cf_cache_hash,cf_cache_hash_tags,cf_cache_imagesizes,cf_cache_imagesizes_tags,cf_cache_news_category,cf_cache_news_category_tags,cf_cache_pages,cf_cache_pages_tags,cf_cache_pagesection,cf_cache_pagesection_tags,cf_cache_rootline,cf_cache_rootline_tags,cf_extbase_datamapfactory_datamap,cf_extbase_datamapfactory_datamap_tags,cf_extbase_object,cf_extbase_object_tags,cf_extbase_reflection,cf_extbase_reflection_tags,cf_tx_solr,cf_tx_solr_configuration,cf_tx_solr_configuration_tags,cf_tx_solr_tags,fe_groups,fe_sessions,fe_users,sys_domain,sys_log,tx_solr_cache,tx_solr_cache_tags"
PHP_EXECUTABLE: "PHP_INI_SCAN_DIR=:/etc/php72/user/${DUMP_USER}/:/home/${DUMP_USER}/cnf/ /opt/php/php72/bin/php"
......@@ -37,7 +36,6 @@ test:unit:
- composer install --ignore-platform-reqs
- composer test:unit
.deploy-template: &deploy_template
stage: deploy
image: composer:1
......@@ -47,7 +45,7 @@ test:unit:
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY_STAGE" | ssh-add -
- echo "$SSH_PRIVATE_KEY_PRODUCTION" | ssh-add -
- ssh-keyscan -p ${STAGE_PORT} ${STAGE_HOST} >> /root/.ssh/known_hosts
- ssh-keyscan ${STAGE_HOST} >> /root/.ssh/known_hosts
- ssh-keyscan -p ${PRODUCTION_PORT} ${PRODUCTION_HOST} >> /root/.ssh/known_hosts
- composer config cache-dir /cache/composer
- composer global require deployer/deployer
......@@ -59,6 +57,17 @@ test:unit:
except:
- assets
deploy-develop:
<<: *deploy_template
environment:
name: develop
url: https://${STAGE_HOST}
script:
- /tmp/vendor/bin/dep --file=./.gitlab-ci/deployer/deploy.php deploy develop
only:
- develop
- task/new-server-2
.maintenance: &maintenance_template
variables:
GIT_STRATEGY: none
......
......@@ -51,7 +51,11 @@ set('rsync', [
]);
set('rsync_src', './');
inventory('./.gitlab-ci/deployer/servers.yml');
set('php', '/opt/php/php72/bin/php');
set('php', 'php');
if (get('stage') === 'production') {
set('php', '/opt/php/php72/bin/php');
}
set('bin_folder', 'vendor/bin/');
task('typo3', function() {
......
......@@ -9,9 +9,8 @@ master:
keep_releases: 2
develop:
stage: stage
hostname: extensions-stage-v9.typo3.org
port: 22200
user: extensionsstage
hostname: extensions.typo3.dev
user: extensions-stage
writable_mode: chmod
forward_agent: true
deploy_path: ~/ci/
......
......@@ -5,7 +5,7 @@ baseVariants:
base: 'https://ter.ddev.site'
condition: 'applicationContext == "Development"'
-
base: 'https://extensions-stage.typo3.org'
base: 'https://extensions.typo3.dev'
condition: 'applicationContext == "Testing"'
-
base: 'https://extensions.typo3.org'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment