From dc9106d365be413b478d61245cfa4d6417298944 Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Wed, 22 Mar 2017 11:39:30 +0100 Subject: [PATCH] bmbf - remove proxy tries --- .../bmbf/test-web02-bmbf.pixelpark.net.yaml | 99 ++++++------------- 1 file changed, 31 insertions(+), 68 deletions(-) diff --git a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml index 160aa4c3..d65913eb 100644 --- a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml +++ b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml @@ -38,6 +38,37 @@ site::profile::mysql_server::databases: password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAv/YgY52U5Hg4CqempEu4H7komdKrzdEaTZnaftR0f3gwxi58x9pBnGTS+uBN4gcqJl5Ia9qkOzaM9V3z4ieEgjaMJB9mHzKCQAw/YUgIGESxOI2Qq97LQldIHsD5AKC8pOOX+9VnnPKgvB96y0bOzf4RZ6ww2rkyK7bC6RP0dqTmzJxulzxTs1GJmL7wyTjHtwqrl+lP4yY3A5aGCLjX33jgfiubWLzDmSwFYM9gCGm3NTfM4nAa3rdgmErlplOw3ocAhkA+9NeuJF2BX+u5xqutemL8j7NoArA2fWEhQI0lMeYUMcKxnX12nItOjBxcSeU39cxAhdppdbO9HLwZzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB6koFHOnjGrXThgRL+WFLYgCDiagiv5K+JmVR0y71uDxEABDZJoF4PDdMJtU5bSaJ9Mg==] site::profile::typo3::projects: + wissenschaftsjahr: + version: '7.6.15' # dummy value + db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKoLre5XPzsMdCxCfly4GcvxSmrx4XEXJ9+0p7UV1AjO6dwYOm8qhsWtodG0MwBYXaoKGqTaipeF7eCvsBuE0zNF1+07MOzCWgTwSrR6EIBUybr7Xc04PvoPQllMSvp1CfRGVBbYZ/JIZhtXuiGoP87MKwa0BlIFO+1gXIu+5AFsFpraFeZnB1hmFnsHBJfK/utGmONA1w2hrsYLVnMJ0WO/mubwmKJE92Im7i/1kHXCc+6aVyICGfD+E9On2Ktlq0F8JOoE3CJT/wqryNNSwCb672gTaZYl1UUVBh8wVXK1rByiXOxUMRLgJb6FGQdMNuKwaOf4yhYstSv0tZwsCDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBePGMowQ3L7+7Kk/VI0/UegCC04jr6cPSBijavVA6vwj1e2q2hFqg+lnXh7tX37eMZCA==] + manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts + servername: test-web02-bmbf.pixelpark.net + ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' + ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + directories: + - location1: + provider: location + path: '/' + auth_type: Digest + auth_name: server + auth_digest_provider: file + auth_digest_algorithm: MD5 + auth_user_file: '/etc/httpd/htdigest' + auth_require: 'valid-user' + require: + - local + rewrites_no_ssl: + - https: + comment: 'all to https' + rewrite_rule: + - '^(.*)$ https://test-web02-bmbf.pixelpark.net$1 [L,R=301]' + user: service.typo3 + mode: '2775' + php_admin_value: + max_input_vars: '1500' + post_max_size: '50M' + upload_max_filesize: '50M' wissenschaftsjahr-2016-17: version: '7.6.15' site_path: '/var/www/wissenschaftsjahr/2016-17' @@ -93,74 +124,6 @@ site::profile::apache::pp_vhosts: PassengerStickySessions on PassengerNodejs /usr/bin/node passenger_app_root: /var/www/wall/ - wissenschaftsjahr: - servername: test-web02-bmbf.pixelpark.net - docroot: /var/www/wissenschaftsjahr - ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' - ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - directories: - - directory_root: - provider: directory - path: '/var/www/wissenschaftsjahr' - options: - - FollowSymLinks - - MultiViews - allow_override: - - None - directoryindex: index.html - - location1: - provider: location - path: '/' - auth_type: Digest - auth_name: server - auth_digest_provider: file - auth_digest_algorithm: MD5 - auth_user_file: '/etc/httpd/htdigest' - auth_require: 'valid-user' - require: - - local - rewrites_non_ssl: - - comment: 'all to https' - rewrite_rule: - - '^(.*)$ https://test-web02-bmbf.pixelpark.net$1 [L,R=301]' - rewrites_ssl: - - comment: 'rewrite to 2016-17' - rewrite_cond: - # Piwik - - '%%{ich-trickse}{REQUEST_URI} !^/piwik/.*' - # Jahreszahlen - - '%%{ich-trickse}{REQUEST_URI} !^/20\d{2}/' - - '%%{ich-trickse}{REQUEST_URI} !^/20\d{2}\-\d{2}/' - # Typo3 - - '%%{ich-trickse}{REQUEST_URI} !^/typo3temp/' - - '%%{ich-trickse}{REQUEST_URI} !^/typo3conf/' - - '%%{ich-trickse}{REQUEST_URI} !^/fileadmin/' - - '%%{ich-trickse}{REQUEST_URI} !^/uploads/' - - '%%{ich-trickse}{REQUEST_URI} !^/typo3/' - # Server status/info - - '%%{ich-trickse}{REQUEST_URI} !^/server-status' - - '%%{ich-trickse}{REQUEST_URI} !^/server-info' - rewrite_rule: - - '^(.*)$ https://%%{ich-trickse}{HTTP_HOST}/2016-17$1 [R=302]' - ssl_proxyengine: true - proxy_pass: - - { path: /2007/, url: 'https://test-abc-der-menschheit-de.pixelpark.net/' } - - { path: /2008/, url: 'https://test-jahr-der-mathematik-de.pixelpark.net/' } - - { path: /2009/, url: 'https://test-www-forschungsexpedition-de.pixelpark.net/' } - - { path: /2010/, url: 'https://test-www-zukunft-der-energie-de.pixelpark.net/' } - - { path: /2011/, url: 'https://test-www-forschung-fuer-unsere-gesundheit-de.pixelpark.net/' } - - { path: /2012/, url: 'https://test-www-zukunftsprojekt-erde-de.pixelpark.net/' } - - { path: /2013/, url: 'https://test-pioniere-des-demografischen-wandels-de.pixelpark.net/' } - - { path: /2014/, url: 'https://test-digital-ist-de.pixelpark.net/' } - - { path: /2015/, url: 'https://test-www-wissenschaftsjahr-zukunftsstadt-de.pixelpark.net/' } - - { path: /2016-17/, url: 'https://test-web02-bmbf-2016-17.pixelpark.net/' } - # For Typo3 - - { path: /typo3temp/, url: 'https://test-web02-bmbf-2016-17.pixelpark.net/typo3temp/' } - - { path: /typo3conf/, url: 'https://test-web02-bmbf-2016-17.pixelpark.net/typo3conf/' } - - { path: /fileadmin/, url: 'https://test-web02-bmbf-2016-17.pixelpark.net/fileadmin/' } - - { path: /uploads/, url: 'https://test-web02-bmbf-2016-17.pixelpark.net/uploads/' } - - { path: /typo3/, url: 'https://test-web02-bmbf-2016-17.pixelpark.net/typo3/' } abc-der-menschheit: docroot: /var/www/wissenschaftsjahr/2007 servername: test-abc-der-menschheit-de.pixelpark.net -- 2.39.5