From d994b700bc7fc69fdf289f887664a745607b7b57 Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Mon, 15 May 2017 10:15:33 +0200 Subject: [PATCH] Remove bibliomed --- .../dev-bibliomed-de.pixelpark.com.yaml | 6 --- customer/bibliomed/development.yaml | 28 ------------- customer/bibliomed/production.yaml | 40 ------------------- ...test-www01-bibliomed-de.pixelpark.net.yaml | 12 ------ ...test-www02-bibliomed-de.pixelpark.net.yaml | 11 ----- customer/bibliomed/test.yaml | 38 ------------------ .../www01-bibliomed-de.pixelpark.net.yaml | 11 ----- .../www02-bibliomed-de.pixelpark.net.yaml | 11 ----- 8 files changed, 157 deletions(-) delete mode 100644 customer/bibliomed/dev-bibliomed-de.pixelpark.com.yaml delete mode 100644 customer/bibliomed/development.yaml delete mode 100644 customer/bibliomed/production.yaml delete mode 100644 customer/bibliomed/test-www01-bibliomed-de.pixelpark.net.yaml delete mode 100644 customer/bibliomed/test-www02-bibliomed-de.pixelpark.net.yaml delete mode 100644 customer/bibliomed/test.yaml delete mode 100644 customer/bibliomed/www01-bibliomed-de.pixelpark.net.yaml delete mode 100644 customer/bibliomed/www02-bibliomed-de.pixelpark.net.yaml diff --git a/customer/bibliomed/dev-bibliomed-de.pixelpark.com.yaml b/customer/bibliomed/dev-bibliomed-de.pixelpark.com.yaml deleted file mode 100644 index d9574d5d..00000000 --- a/customer/bibliomed/dev-bibliomed-de.pixelpark.com.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -infra::role: base -infra::additional_classes: - - bibliomed - - pp_mcollective - diff --git a/customer/bibliomed/development.yaml b/customer/bibliomed/development.yaml deleted file mode 100644 index b7ccbd95..00000000 --- a/customer/bibliomed/development.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -accounts::users: - m_scholze: - apply: true - sudo: true - annika.wenzel: - apply: true - sudo: true - matthias.otto: - apply: true - sudo: true - -bibliomed::params::jdbc_default_url: "jdbc:postgresql://dev-bibliomed-de.pixelpark.com:5432/station24_liferay" -bibliomed::params::jdbc_default_url_jcr: "jdbc:postgresql://dev-bibliomed-de.pixelpark.com:5432/station24_jcr" -bibliomed::params::jdbc_default_username: "station24_user" -bibliomed::params::jdbc_default_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXwhrYZ64pj38VH80s/pu2s3EKJ0/x0lUJlKCnNBIHLtgtTzso1mgAwzyX6cjH2PX1Dxp9Dt8Cj+Ts73PMoQhgEbjtZv0c+Y44HiyC5ctMjcgxfvMY98PsytcloXjy0ga9jm6MLDTyLRHTD0blTX/U+P2KrJVg+gNQ+1azH8caIqzDb+chqvhbrCrH8o4ZhOH4n51b/WVAmktXqT4beLN68zMqmKCfYpLe2RWS5IJ1zCht2QN14ujH8S1xXBeJWkMjdmSJgpJPjpuqdrZlR/COQ6qykUjCBJgWrlPqJhhxtwTzKqxh8BkVgA+1hMV2SGiqKo+1a4j80RETgDI7EvBjjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCduSuZUb8IgUuNs7+keOtUgBCCc8fNBNtoAJKNqb4fTfpe] -bibliomed::params::liferay_home: "/www/data/liferay" -bibliomed::params::zeitschriftenarchiv_flash_base_path: "/www/data/liferay/zeitschriftenarchiv" -bibliomed::params::domain_url: "dev-bibliomed-de.pixelpark.com" -bibliomed::params::rootLogger_debug_level: "INFO" -bibliomed::params::appender_debug_level: "DEBUG" -bibliomed::params::logpath: "/www/logs/tomcat/dev.bibliomed.de" -bibliomed::params::node_id: "dev" -bibliomed::params::tomcat_server_name: 'dev.bibliomed.de' -bibliomed::params::env: dev - -xymon::modules: - - 'net2' \ No newline at end of file diff --git a/customer/bibliomed/production.yaml b/customer/bibliomed/production.yaml deleted file mode 100644 index fbbb90f0..00000000 --- a/customer/bibliomed/production.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -accounts::users: - m_scholze: - apply: true - annika.wenzel: - apply: true - - -bibliomed::params::liferay_home: "/www/data/liferay" -bibliomed::params::tomcat_webapps_dir: "/www/htdocs/www.bibliomed.de/webapps" -bibliomed::params::tomcat_site_dir: "/www/conf/tomcat/www.bibliomed.de" -bibliomed::params::tomcat_libs_ext: "/www/conf/tomcat/www.bibliomed.de/lib/ext" -# in portal-ext.properties noch aendern -bibliomed::params::jdbc_default_url: "jdbc:postgresql://db01-bibliomed-de.pixelpark.net:5432/station24_liferay" -bibliomed::params::jdbc_default_url_jcr: "jdbc:postgresql://db01-bibliomed-de.pixelpark.net:5432/station24_jcr" -bibliomed::params::jdbc_default_username: "station24_user" -bibliomed::params::jdbc_default_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoy2iUan0xfQKWnnByUF7KLyQNoC7sEidf0qJknGuUk3NShvWZhH4/0A418BwNms8xvBufEdGkFCO7NiJN9B6T9R9NTCZX3MZsdzozxeclaLasOvDajruQNmzosKT89Fd65OQP/NfRsfA/rl+sGKOZx4Y7Fck/nzJlhUhZhs88qhXAUq611Vzyl8kd0eIc8xJJuOo2JhTy0j2zApkBdpOdEmO5ZbTvgtcYoJkOdSIRm+gV3TJ7h0wR2+kLnVIo++USfux6S+lLpCUPj8eqLUGAGWwAzLQmv68Tj8RQfzzsSUcDT7Er2lwupJnKnFWFxwqglFS8SvwFDKtd1KNbbenrzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCPZq9ZbQcrDDtrJM+c4+tTgBCMf2zOOH82eBSK++jRX2oU] -bibliomed::params::zeitschriftenarchiv_flash_base_path: "/www/data/liferay/zeitschriftenarchiv" -bibliomed::params::domain_url: "www.bibliomedmanager.de" -bibliomed::params::rootLogger_debug_level: "INFO" -bibliomed::params::appender_debug_level: "INFO" -bibliomed::params::logpath: "/www/logs/tomcat/www.bibliomed.de" -bibliomed::params::tomcat_server_name: 'www.bibliomed.de' - -logstash::filter: - - tomcat -logstash::generic_resource: - bibliomed_tomcat_liferay: - resource: file - order: 10 # Input - parameters: - path: /www/logs/tomcat/www.bibliomed.de/portal.log - type: tomcat - tags: - - "%{customer}" - - "%{environment}" - codec: - type: multiline - what: previous - pattern: '(^\d+\serror)|(^.+Exception: .+)|(^\s+at .+)|(^\s+... \d+ more)|(^\s*Caused by:.+)' \ No newline at end of file diff --git a/customer/bibliomed/test-www01-bibliomed-de.pixelpark.net.yaml b/customer/bibliomed/test-www01-bibliomed-de.pixelpark.net.yaml deleted file mode 100644 index 630ac4d3..00000000 --- a/customer/bibliomed/test-www01-bibliomed-de.pixelpark.net.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -infra::additional_classes: - - bibliomed - - accounts - - logstash - - pp_mcollective - - -bibliomed::params::node_id: "test_www01" -bibliomed::params::logpath: "/www/logs/tomcat/test-www01-bibliomed-de.pixelpark.net" -bibliomed::params::tomcat_server_name: 'test-www01-bibliomed-de.pixelpark.net' -bibliomed::params::env: test-www01 diff --git a/customer/bibliomed/test-www02-bibliomed-de.pixelpark.net.yaml b/customer/bibliomed/test-www02-bibliomed-de.pixelpark.net.yaml deleted file mode 100644 index 0c80a305..00000000 --- a/customer/bibliomed/test-www02-bibliomed-de.pixelpark.net.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -infra::additional_classes: - - bibliomed - - accounts - - logstash - - pp_mcollective - -bibliomed::params::node_id: "test_www02" -bibliomed::params::logpath: "/www/logs/tomcat/test-www02-bibliomed-de.pixelpark.net" -bibliomed::params::tomcat_server_name: 'test-www02-bibliomed-de.pixelpark.net' -bibliomed::params::env: test-www02 diff --git a/customer/bibliomed/test.yaml b/customer/bibliomed/test.yaml deleted file mode 100644 index 58ea3022..00000000 --- a/customer/bibliomed/test.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -accounts::users: - m_scholze: - apply: true - sudo: true - annika.wenzel: - apply: true - sudo: true - -# -# in portal-ext.properties noch aendern -bibliomed::params::jdbc_default_url: "jdbc:postgresql://test-db01-bibliomed-de.pixelpark.net:5432/station24_liferay" -bibliomed::params::jdbc_default_url_jcr: "jdbc:postgresql://test-db01-bibliomed-de.pixelpark.net:5432/station24_jcr" -bibliomed::params::jdbc_default_username: "station24_user" -bibliomed::params::jdbc_default_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWIpdpz00ZWgrBCPBXut62gPRBfrh1oHp7WTNjkb1a9Sr2d2vupXYrqAgpk+k2u9Uu8afDXWRonFKKwLJn20bXTe1nXMopRwMCRRbb+cyb4Ed6ZFJLqDa90j09dgFIlfEBmX0ObZvjgzdxJEKhPBJU125k9myNMC1H/V61oHZnJmYyXplr3h1dWu7dsvJsmtQAfUnuHhG3olKPh1vRJtTxQW61aX7dftVBd1fybwM035LGHO3QTCr7918Hi1gXgfBysZkEP+r62EVgMHP67x2nOQd+jedokxYMYI8lIUdqtK6jY33Zykf9im6NgZXX/M1LN/cgR2adOjQFEdVo591jzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCKO8X1CxHoSK3zBALcteJGgBDiMsXVFjRNwNHU5nPczgnZ] -bibliomed::params::liferay_home: "/www/data/liferay" -bibliomed::params::zeitschriftenarchiv_flash_base_path: "/www/data/liferay/zeitschriftenarchiv" -bibliomed::params::domain_url: "test-bibliomedmanager-de.pixelpark.net" -bibliomed::params::rootLogger_debug_level: "INFO" -bibliomed::params::appender_debug_level: "DEBUG" - - -logstash::filter: - - tomcat -logstash::generic_resource: - bibliomed_tomcat_liferay: - resource: file - order: 10 # Input - parameters: - path: /www/logs/tomcat/%{fqdn}/portal.log - type: tomcat - tags: - - "%{customer}" - - "%{environment}" - codec: - type: multiline - what: previous - pattern: '(^\d+\serror)|(^.+Exception: .+)|(^\s+at .+)|(^\s+... \d+ more)|(^\s*Caused by:.+)' \ No newline at end of file diff --git a/customer/bibliomed/www01-bibliomed-de.pixelpark.net.yaml b/customer/bibliomed/www01-bibliomed-de.pixelpark.net.yaml deleted file mode 100644 index 0d6ae2d5..00000000 --- a/customer/bibliomed/www01-bibliomed-de.pixelpark.net.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -infra::additional_classes: - - bibliomed - - repo - - accounts - - logstash - -# -# in portal-ext.properties noch aendern -bibliomed::params::node_id: "www01" -bibliomed::params::env: www01 diff --git a/customer/bibliomed/www02-bibliomed-de.pixelpark.net.yaml b/customer/bibliomed/www02-bibliomed-de.pixelpark.net.yaml deleted file mode 100644 index fed20873..00000000 --- a/customer/bibliomed/www02-bibliomed-de.pixelpark.net.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -infra::additional_classes: - - bibliomed - - repo - - accounts - - logstash - - -# in portal-ext.properties noch aendern -bibliomed::params::node_id: "www02" -bibliomed::params::env: www02 -- 2.39.5