]> Frank Brehm's Git Trees - pixelpark/hiera.git/log
pixelpark/hiera.git
7 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Fri, 31 Mar 2017 12:31:29 +0000 (14:31 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

7 years agofbb-werbung - postfix files
Philipp Dallig [Fri, 31 Mar 2017 12:31:24 +0000 (14:31 +0200)]
fbb-werbung - postfix files

7 years agoMHK - removed mongodb
Oliver Böttcher [Fri, 31 Mar 2017 06:41:19 +0000 (08:41 +0200)]
MHK - removed mongodb

7 years agoMHK - Studio logfile -> logstash
Oliver Böttcher [Fri, 31 Mar 2017 06:39:33 +0000 (08:39 +0200)]
MHK - Studio logfile -> logstash

7 years agopixelpark - dev-monitoring: disable ping4, because 'hostalive' already does a ping...
Thomas Dalichow [Thu, 30 Mar 2017 16:27:18 +0000 (18:27 +0200)]
pixelpark - dev-monitoring: disable ping4, because 'hostalive' already does a ping with packet loss check

7 years agopixelpark - dev-monitoring: temporarily disable checks that need endpoints, endpoints...
Thomas Dalichow [Thu, 30 Mar 2017 16:17:13 +0000 (18:17 +0200)]
pixelpark - dev-monitoring: temporarily disable checks that need endpoints, endpoints will be exported soon

7 years agoMHK - config cleanups
Oliver Böttcher [Thu, 30 Mar 2017 15:28:08 +0000 (17:28 +0200)]
MHK - config cleanups

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Thu, 30 Mar 2017 14:47:53 +0000 (16:47 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agombvd-classicpartner-messe remove web auth
Andreas Gerstenberg [Thu, 30 Mar 2017 14:47:46 +0000 (16:47 +0200)]
mbvd-classicpartner-messe remove web auth

7 years agopixelpark - dev-monitoring: add bogus host template because of PDB-170 (Puppetlabs...
Thomas Dalichow [Thu, 30 Mar 2017 14:44:25 +0000 (16:44 +0200)]
pixelpark - dev-monitoring: add bogus host template because of PDB-170 (Puppetlabs JIRA) (fix)

7 years agopixelpark - dev-monitoring: add bogus host template because of PDB-170 (Puppetlabs...
Thomas Dalichow [Thu, 30 Mar 2017 14:33:27 +0000 (16:33 +0200)]
pixelpark - dev-monitoring: add bogus host template because of PDB-170 (Puppetlabs JIRA) (fix)

7 years agofbb-werbung - add virtual file
Philipp Dallig [Thu, 30 Mar 2017 14:29:20 +0000 (16:29 +0200)]
fbb-werbung - add virtual file

7 years agopixelpark - dev-monitoring: add bogus host template because of PDB-170 (Puppetlabs...
Thomas Dalichow [Thu, 30 Mar 2017 14:27:25 +0000 (16:27 +0200)]
pixelpark - dev-monitoring: add bogus host template because of PDB-170 (Puppetlabs JIRA) (fix)

7 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Thu, 30 Mar 2017 14:23:37 +0000 (16:23 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

7 years agofbb-werbung - first steps with postfix
Philipp Dallig [Thu, 30 Mar 2017 14:23:31 +0000 (16:23 +0200)]
fbb-werbung - first steps with postfix

7 years agome-adapter-service add require ip ranges
Andreas Gerstenberg [Thu, 30 Mar 2017 14:17:11 +0000 (16:17 +0200)]
me-adapter-service add require ip ranges

7 years agopixelpark - dev-monitoring: add bogus host template because of PDB-170 (Puppetlabs...
Thomas Dalichow [Thu, 30 Mar 2017 14:15:24 +0000 (16:15 +0200)]
pixelpark - dev-monitoring: add bogus host template because of PDB-170 (Puppetlabs JIRA

7 years agomarketing set test Variable
Andreas Gerstenberg [Thu, 30 Mar 2017 13:38:39 +0000 (15:38 +0200)]
marketing set test Variable

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Thu, 30 Mar 2017 13:21:26 +0000 (15:21 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agomarketing set test var
Andreas Gerstenberg [Thu, 30 Mar 2017 13:21:12 +0000 (15:21 +0200)]
marketing set test var

7 years agoupdated typo3 for arbeit4.0
Thomas Heller [Thu, 30 Mar 2017 13:18:57 +0000 (15:18 +0200)]
updated typo3 for arbeit4.0

7 years agoMHK - fix rewrite rules
Oliver Böttcher [Thu, 30 Mar 2017 12:56:19 +0000 (14:56 +0200)]
MHK - fix rewrite rules

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Thu, 30 Mar 2017 12:46:59 +0000 (14:46 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agosirona-aem add rewrites to sirona-clinic
Andreas Gerstenberg [Thu, 30 Mar 2017 12:46:45 +0000 (14:46 +0200)]
sirona-aem add rewrites to sirona-clinic

7 years agoODT - acls
Oliver Böttcher [Thu, 30 Mar 2017 12:21:02 +0000 (14:21 +0200)]
ODT - acls

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Thomas Heller [Thu, 30 Mar 2017 11:46:14 +0000 (13:46 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agotypo3 update to 7.6.16 for arb4.0 % fis-nw
Thomas Heller [Thu, 30 Mar 2017 11:45:41 +0000 (13:45 +0200)]
typo3 update to 7.6.16 for arb4.0 % fis-nw

7 years agoMHK - fix rewrite rules
Oliver Böttcher [Thu, 30 Mar 2017 11:44:24 +0000 (13:44 +0200)]
MHK - fix rewrite rules

7 years agopixelpark - dev-monitoring: now comes in via exported resources
Thomas Dalichow [Thu, 30 Mar 2017 10:36:24 +0000 (12:36 +0200)]
pixelpark - dev-monitoring: now comes in via exported resources

7 years agoMHK - fix rewrite rules
Oliver Böttcher [Thu, 30 Mar 2017 10:13:25 +0000 (12:13 +0200)]
MHK - fix rewrite rules

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Thu, 30 Mar 2017 09:47:39 +0000 (11:47 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agosirona-aem add rewrites to sirona-clinic
Andreas Gerstenberg [Thu, 30 Mar 2017 09:47:31 +0000 (11:47 +0200)]
sirona-aem add rewrites to sirona-clinic

7 years agofbb-werbung - logstash log4j on all instances
Philipp Dallig [Thu, 30 Mar 2017 09:38:25 +0000 (11:38 +0200)]
fbb-werbung - logstash log4j on all instances

7 years agofbb-werbung - log4j listen on localhost
Philipp Dallig [Thu, 30 Mar 2017 08:57:26 +0000 (10:57 +0200)]
fbb-werbung - log4j listen on localhost

7 years agofbb-werbung - add log4j input
Philipp Dallig [Thu, 30 Mar 2017 08:39:16 +0000 (10:39 +0200)]
fbb-werbung - add log4j input

7 years agoMHK - www-kueche-de -> kueche.de
Oliver Böttcher [Wed, 29 Mar 2017 14:41:53 +0000 (16:41 +0200)]
MHK - www-kueche-de -> kueche.de

7 years agoMHK - www-kueche-de -> kueche.de
Oliver Böttcher [Wed, 29 Mar 2017 14:37:14 +0000 (16:37 +0200)]
MHK - www-kueche-de -> kueche.de

7 years agoMerge branch 'patch-26' into 'master'
Philipp Dallig [Wed, 29 Mar 2017 14:28:55 +0000 (16:28 +0200)]
Merge branch 'patch-26' into 'master'

SIRONAADFR-1414: Add update check filter rule

See merge request !143

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 29 Mar 2017 14:22:30 +0000 (16:22 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agombvd-classicpartner-messe add user bastian.kuhn
Andreas Gerstenberg [Wed, 29 Mar 2017 14:22:23 +0000 (16:22 +0200)]
mbvd-classicpartner-messe add user bastian.kuhn

7 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Wed, 29 Mar 2017 13:53:51 +0000 (15:53 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

7 years agomedperts-com - stop deployment
Philipp Dallig [Wed, 29 Mar 2017 13:53:46 +0000 (15:53 +0200)]
medperts-com - stop deployment

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 29 Mar 2017 13:49:37 +0000 (15:49 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agomarketing-publicis-ai add serveralias
Andreas Gerstenberg [Wed, 29 Mar 2017 13:49:29 +0000 (15:49 +0200)]
marketing-publicis-ai add serveralias

7 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Wed, 29 Mar 2017 13:32:02 +0000 (15:32 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

7 years agomedperts-com - start deployment
Philipp Dallig [Wed, 29 Mar 2017 13:31:57 +0000 (15:31 +0200)]
medperts-com - start deployment

7 years agoset orat lc_time_names
sambufe [Wed, 29 Mar 2017 13:19:26 +0000 (15:19 +0200)]
set orat lc_time_names

7 years agofbb-werbung - remove htaccess because magnolia is strange
Philipp Dallig [Wed, 29 Mar 2017 13:10:33 +0000 (15:10 +0200)]
fbb-werbung - remove htaccess because magnolia is strange

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 29 Mar 2017 12:46:41 +0000 (14:46 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agomcdonalds update server aliases
Andreas Gerstenberg [Wed, 29 Mar 2017 12:46:29 +0000 (14:46 +0200)]
mcdonalds update server aliases

7 years agosirona-aem - correct cronjob hours
Philipp Dallig [Wed, 29 Mar 2017 12:32:39 +0000 (14:32 +0200)]
sirona-aem - correct cronjob hours

7 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Wed, 29 Mar 2017 12:30:25 +0000 (14:30 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

7 years agosirona-aem - snapshot at 12 and 24
Philipp Dallig [Wed, 29 Mar 2017 12:30:19 +0000 (14:30 +0200)]
sirona-aem - snapshot at 12 and 24

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 29 Mar 2017 12:28:12 +0000 (14:28 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agomcdonalds initial
Andreas Gerstenberg [Wed, 29 Mar 2017 12:28:02 +0000 (14:28 +0200)]
mcdonalds initial

7 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Wed, 29 Mar 2017 12:21:45 +0000 (14:21 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

7 years agosirona-aem - switch docroot
Philipp Dallig [Wed, 29 Mar 2017 12:21:41 +0000 (14:21 +0200)]
sirona-aem - switch docroot

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 29 Mar 2017 11:24:11 +0000 (13:24 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agome-adapter-service remove proxy rule
Andreas Gerstenberg [Wed, 29 Mar 2017 11:23:59 +0000 (13:23 +0200)]
me-adapter-service remove proxy rule

7 years agoMerge branch 'patch-25' into 'master'
Philipp Dallig [Wed, 29 Mar 2017 11:21:05 +0000 (13:21 +0200)]
Merge branch 'patch-25' into 'master'

set X-Frame-Options: SAMEORIGIN at dev-pfizer-dtd-preview.pixelpark.net

See merge request !142

7 years agome-adapter-service add proxy rule
Andreas Gerstenberg [Wed, 29 Mar 2017 11:19:45 +0000 (13:19 +0200)]
me-adapter-service add proxy rule

7 years agome-adapter-service change proxy from ajp to http
Andreas Gerstenberg [Wed, 29 Mar 2017 11:16:41 +0000 (13:16 +0200)]
me-adapter-service change proxy from ajp to http

7 years agome-adapter-service change ajp to http proxy
Andreas Gerstenberg [Wed, 29 Mar 2017 11:13:51 +0000 (13:13 +0200)]
me-adapter-service change ajp to http proxy

7 years agoSIRONAADFR-1414: Add update check filter rule
Jochen Bieler [Wed, 29 Mar 2017 10:57:57 +0000 (12:57 +0200)]
SIRONAADFR-1414: Add update check filter rule

7 years agoSIRONAADFR-1414: Add update check filter rule
Jochen Bieler [Wed, 29 Mar 2017 10:56:43 +0000 (12:56 +0200)]
SIRONAADFR-1414: Add update check filter rule

7 years agomarketing-publicis-ai add cronjobs
Andreas Gerstenberg [Wed, 29 Mar 2017 10:43:35 +0000 (12:43 +0200)]
marketing-publicis-ai add cronjobs

7 years agoset X-Frame-Options: SAMEORIGIN at dev-pfizer-dtd-preview.pixelpark.net
Dennis Klein [Wed, 29 Mar 2017 09:41:19 +0000 (11:41 +0200)]
set X-Frame-Options: SAMEORIGIN at dev-pfizer-dtd-preview.pixelpark.net

7 years agome-adapter-service modify ssl pathes
Andreas Gerstenberg [Wed, 29 Mar 2017 08:58:20 +0000 (10:58 +0200)]
me-adapter-service modify ssl pathes

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 29 Mar 2017 08:50:52 +0000 (10:50 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agome-adapter-service add webserver
Andreas Gerstenberg [Wed, 29 Mar 2017 08:50:36 +0000 (10:50 +0200)]
me-adapter-service add webserver

7 years agofbb-werbung - change htaccess
Philipp Dallig [Tue, 28 Mar 2017 17:11:01 +0000 (19:11 +0200)]
fbb-werbung - change htaccess

7 years agofbb-werbung - add htaccess
Philipp Dallig [Tue, 28 Mar 2017 17:03:46 +0000 (19:03 +0200)]
fbb-werbung - add htaccess

7 years agopixelpark - dev-monitoring: revert vars addition
Thomas Dalichow [Tue, 28 Mar 2017 16:18:20 +0000 (18:18 +0200)]
pixelpark - dev-monitoring: revert vars addition

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts (try)
Thomas Dalichow [Tue, 28 Mar 2017 16:02:21 +0000 (18:02 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts (try)

7 years agomodify rewritecond
Andreas Gerstenberg [Tue, 28 Mar 2017 15:27:57 +0000 (17:27 +0200)]
modify rewritecond

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Tue, 28 Mar 2017 15:23:03 +0000 (17:23 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agopixelpark modify settings jira02
Andreas Gerstenberg [Tue, 28 Mar 2017 15:22:36 +0000 (17:22 +0200)]
pixelpark modify settings jira02

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts (try)
Thomas Dalichow [Tue, 28 Mar 2017 15:08:44 +0000 (17:08 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts (try)

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts (try)
Thomas Dalichow [Tue, 28 Mar 2017 15:06:35 +0000 (17:06 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts (try)

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)
Thomas Dalichow [Tue, 28 Mar 2017 14:38:05 +0000 (16:38 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)
Thomas Dalichow [Tue, 28 Mar 2017 14:35:02 +0000 (16:35 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)
Thomas Dalichow [Tue, 28 Mar 2017 14:26:30 +0000 (16:26 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)
Thomas Dalichow [Tue, 28 Mar 2017 14:09:43 +0000 (16:09 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)
Thomas Dalichow [Tue, 28 Mar 2017 13:44:10 +0000 (15:44 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts (fix)

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Tue, 28 Mar 2017 13:36:29 +0000 (15:36 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agomarketing-publicis-ai add jenkins user
Andreas Gerstenberg [Tue, 28 Mar 2017 13:36:14 +0000 (15:36 +0200)]
marketing-publicis-ai add jenkins user

7 years agofbb - change database host in comment
Philipp Dallig [Tue, 28 Mar 2017 12:44:35 +0000 (14:44 +0200)]
fbb - change database host in comment

7 years agopixelpark - dev-monitoring: add vars for mail addresses on hosts
Thomas Dalichow [Tue, 28 Mar 2017 12:39:52 +0000 (14:39 +0200)]
pixelpark - dev-monitoring: add vars for mail addresses on hosts

7 years agombvd-adpater-service add developer
Andreas Gerstenberg [Tue, 28 Mar 2017 12:36:54 +0000 (14:36 +0200)]
mbvd-adpater-service add developer

7 years agomarketing-publicis-ai modify cronjobs
Andreas Gerstenberg [Tue, 28 Mar 2017 12:24:53 +0000 (14:24 +0200)]
marketing-publicis-ai modify cronjobs

7 years agomarketing-publicis-ai modify cronjobs
Andreas Gerstenberg [Tue, 28 Mar 2017 12:21:19 +0000 (14:21 +0200)]
marketing-publicis-ai modify cronjobs

7 years agomarketing-publicis-ai: modify cronjobs
Andreas Gerstenberg [Tue, 28 Mar 2017 12:18:36 +0000 (14:18 +0200)]
marketing-publicis-ai: modify cronjobs

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Tue, 28 Mar 2017 12:16:18 +0000 (14:16 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agomarketing-publicis-ai add cronjobs
Andreas Gerstenberg [Tue, 28 Mar 2017 12:16:10 +0000 (14:16 +0200)]
marketing-publicis-ai add cronjobs

7 years agoMBVD ODT - phunking module
Oliver Böttcher [Tue, 28 Mar 2017 11:35:58 +0000 (13:35 +0200)]
MBVD ODT - phunking module

7 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Tue, 28 Mar 2017 11:02:31 +0000 (13:02 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

7 years agopixelpark-pmp add LAMP initial
Andreas Gerstenberg [Tue, 28 Mar 2017 11:02:08 +0000 (13:02 +0200)]
pixelpark-pmp add LAMP initial

7 years agoMBVD ODT - Live env
Oliver Böttcher [Tue, 28 Mar 2017 10:13:15 +0000 (12:13 +0200)]
MBVD ODT - Live env

7 years agopixelpark - correct header
Philipp Dallig [Mon, 27 Mar 2017 15:55:22 +0000 (17:55 +0200)]
pixelpark - correct header

7 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Mon, 27 Mar 2017 15:08:25 +0000 (17:08 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git