]>
Frank Brehm's Git Trees - pixelpark/hiera.git/log
Oliver Böttcher [Thu, 6 Apr 2017 10:27:47 +0000 (12:27 +0200)]
ODT - opencms rewrites
Oliver Böttcher [Thu, 6 Apr 2017 10:16:57 +0000 (12:16 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Oliver Böttcher [Thu, 6 Apr 2017 10:16:50 +0000 (12:16 +0200)]
ODT - opencms rewrites
Frank Brehm [Thu, 6 Apr 2017 10:16:49 +0000 (12:16 +0200)]
Adding hash:/etc/postfix/maps/discarded_domains as an additional Postfix transport table in customer/pixelpark-mail/common.yaml
Frank Brehm [Thu, 6 Apr 2017 10:08:36 +0000 (12:08 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Frank Brehm [Thu, 6 Apr 2017 10:08:26 +0000 (12:08 +0200)]
Adding maps/discarded_domains as a special lookup table for Postfix transport
sambufe [Thu, 6 Apr 2017 10:05:39 +0000 (12:05 +0200)]
added CSP header on Orat test and PRD
Oliver Böttcher [Thu, 6 Apr 2017 09:51:37 +0000 (11:51 +0200)]
ODT - reorder
Oliver Böttcher [Thu, 6 Apr 2017 09:14:35 +0000 (11:14 +0200)]
ODT - fix rewrites
sambufe [Thu, 6 Apr 2017 09:06:35 +0000 (11:06 +0200)]
fbb hosting deployment
Oliver Böttcher [Thu, 6 Apr 2017 08:33:16 +0000 (10:33 +0200)]
ODT - fix rewrites
Oliver Böttcher [Wed, 5 Apr 2017 17:39:13 +0000 (19:39 +0200)]
ODT - mod_remoteip
Philipp Dallig [Wed, 5 Apr 2017 17:00:50 +0000 (19:00 +0200)]
common.yaml - correct name comment
Philipp Dallig [Wed, 5 Apr 2017 16:13:43 +0000 (18:13 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Wed, 5 Apr 2017 16:13:38 +0000 (18:13 +0200)]
bmas-typo3 - change docroot user
Philipp Dallig [Wed, 5 Apr 2017 15:53:05 +0000 (17:53 +0200)]
Merge branch 'patch-32' into 'master'
Update common.yaml
See merge request !156
Philipp Dallig [Wed, 5 Apr 2017 15:52:01 +0000 (17:52 +0200)]
Merge branch 'patch-31' into 'master'
Update common.yaml
See merge request !155
Philipp Dallig [Wed, 5 Apr 2017 15:50:03 +0000 (17:50 +0200)]
Merge branch 'patch-28' into 'master'
Update dev-web-ngcc-daimler.pixelpark.net.yaml
See merge request !154
Christof Höfler [Wed, 5 Apr 2017 15:44:28 +0000 (17:44 +0200)]
Update common.yaml
Oliver Böttcher [Wed, 5 Apr 2017 15:43:22 +0000 (17:43 +0200)]
ODT - fix short urls
Christof Höfler [Wed, 5 Apr 2017 15:17:55 +0000 (17:17 +0200)]
Update common.yaml
Dennis Klein [Wed, 5 Apr 2017 15:02:46 +0000 (17:02 +0200)]
Update dev-web-ngcc-daimler.pixelpark.net.yaml
add *.fbcdn.net to security headers for Facebook images and movies
Oliver Böttcher [Wed, 5 Apr 2017 14:53:51 +0000 (16:53 +0200)]
ODT - smart & truckworks
Oliver Böttcher [Wed, 5 Apr 2017 14:33:33 +0000 (16:33 +0200)]
ODT - fix kampagnen
Oliver Böttcher [Wed, 5 Apr 2017 14:19:15 +0000 (16:19 +0200)]
ODT - fix kampagnen
Oliver Böttcher [Wed, 5 Apr 2017 14:08:54 +0000 (16:08 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Philipp Dallig [Wed, 5 Apr 2017 14:08:45 +0000 (16:08 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Conflicts:
customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
Oliver Böttcher [Wed, 5 Apr 2017 14:07:51 +0000 (16:07 +0200)]
ODT - umzug
Philipp Dallig [Wed, 5 Apr 2017 14:07:37 +0000 (16:07 +0200)]
rename site to infra
Oliver Böttcher [Wed, 5 Apr 2017 13:59:42 +0000 (15:59 +0200)]
ODT - umzug
Oliver Böttcher [Wed, 5 Apr 2017 13:55:05 +0000 (15:55 +0200)]
ODT - umzug
Oliver Böttcher [Wed, 5 Apr 2017 13:44:13 +0000 (15:44 +0200)]
ODT - umzug
Thomas Heller [Wed, 5 Apr 2017 13:34:10 +0000 (15:34 +0200)]
added c.hoefler to trapo-top10
Oliver Böttcher [Wed, 5 Apr 2017 13:26:59 +0000 (15:26 +0200)]
erge branch 'master' of git.pixelpark.com:puppet/hiera
Oliver Böttcher [Wed, 5 Apr 2017 13:26:53 +0000 (15:26 +0200)]
ODT - umzug
Philipp Dallig [Wed, 5 Apr 2017 13:26:28 +0000 (15:26 +0200)]
fbb-werbung - add devwerbung-berlin-airport-de
Oliver Böttcher [Wed, 5 Apr 2017 13:21:48 +0000 (15:21 +0200)]
ODT - umzug
Oliver Böttcher [Wed, 5 Apr 2017 13:19:03 +0000 (15:19 +0200)]
ODT - umzug
Oliver Böttcher [Wed, 5 Apr 2017 13:14:49 +0000 (15:14 +0200)]
ODT - umzug
Oliver Böttcher [Wed, 5 Apr 2017 13:05:29 +0000 (15:05 +0200)]
ODT - umzug
Philipp Dallig [Wed, 5 Apr 2017 12:54:16 +0000 (14:54 +0200)]
fbb-werbung - move some informations to development.yaml
Oliver Böttcher [Wed, 5 Apr 2017 12:20:16 +0000 (14:20 +0200)]
ODT - umzug
Oliver Böttcher [Wed, 5 Apr 2017 12:14:09 +0000 (14:14 +0200)]
ODT - umzug
Thomas Dalichow [Wed, 5 Apr 2017 11:38:17 +0000 (13:38 +0200)]
mbvd-odt - vHost-Migration von alter Kiste
Hannes Eichblatt [Wed, 5 Apr 2017 11:29:34 +0000 (13:29 +0200)]
fbb-werbung - Initial def dev-werbung-berlin-airport-de
Andreas Gerstenberg [Wed, 5 Apr 2017 09:54:19 +0000 (11:54 +0200)]
mbvd-amg-gt-roadster remove web-auth
Andreas Gerstenberg [Wed, 5 Apr 2017 09:46:34 +0000 (11:46 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 5 Apr 2017 09:46:24 +0000 (11:46 +0200)]
pfizer add ssl cert www.schlaganfall-verhindern.de
Philipp Dallig [Wed, 5 Apr 2017 09:41:04 +0000 (11:41 +0200)]
Merge branch 'sirona-prod-deployment-1.5' into 'master'
Update package versions to release 1.5 for PROD
See merge request !150
Andreas Gerstenberg [Wed, 5 Apr 2017 08:53:05 +0000 (10:53 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 5 Apr 2017 08:52:47 +0000 (10:52 +0200)]
mbvd-transporter-topleasing add alias
Oliver Böttcher [Wed, 5 Apr 2017 08:39:46 +0000 (10:39 +0200)]
ODT - fix pg_hba
Oliver Böttcher [Wed, 5 Apr 2017 07:59:48 +0000 (09:59 +0200)]
ODT - newsletter vhosts
Dominic Radtke [Wed, 5 Apr 2017 07:04:43 +0000 (09:04 +0200)]
Update package versions to release 1.5 for PROD
Andreas Gerstenberg [Wed, 5 Apr 2017 06:44:03 +0000 (08:44 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Wed, 5 Apr 2017 06:43:48 +0000 (08:43 +0200)]
pixelpark add ssl cert for campaign.pepperl-fuchs.de
Oliver Böttcher [Tue, 4 Apr 2017 15:12:27 +0000 (17:12 +0200)]
ODT - pg_hba
Oliver Böttcher [Tue, 4 Apr 2017 14:55:39 +0000 (16:55 +0200)]
ODT - pg_hba
Thomas Heller [Tue, 4 Apr 2017 12:53:45 +0000 (14:53 +0200)]
added michael.franke to global common.yml + to SWD project
Andreas Gerstenberg [Tue, 4 Apr 2017 12:11:12 +0000 (14:11 +0200)]
dbad disable puppet rollout for apache on web40/41
Andreas Gerstenberg [Tue, 4 Apr 2017 12:00:39 +0000 (14:00 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Tue, 4 Apr 2017 12:00:27 +0000 (14:00 +0200)]
dbad apache + mysql rollout
Hannes Eichblatt [Tue, 4 Apr 2017 09:25:36 +0000 (11:25 +0200)]
pixelpark - initial definition abnahme.pp.com
Andreas Gerstenberg [Tue, 4 Apr 2017 07:37:32 +0000 (09:37 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Tue, 4 Apr 2017 07:37:19 +0000 (09:37 +0200)]
mbvd-transporter-topdeal zeitlich begrenzte Weiterleitung
Philipp Dallig [Tue, 4 Apr 2017 07:21:02 +0000 (09:21 +0200)]
Merge branch 'patch-27' into 'master'
Update common.yaml and add key for thaupt
See merge request !149
Toni Haupt [Tue, 4 Apr 2017 06:56:13 +0000 (08:56 +0200)]
Update common.yaml and add key for thaupt
Philipp Dallig [Mon, 3 Apr 2017 17:48:36 +0000 (19:48 +0200)]
bmas-sgb2 - some improvments
Andreas Gerstenberg [Mon, 3 Apr 2017 14:41:47 +0000 (16:41 +0200)]
marketing-publicis-ai add env var to cronjobs
Andreas Gerstenberg [Mon, 3 Apr 2017 14:30:17 +0000 (16:30 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Mon, 3 Apr 2017 14:30:06 +0000 (16:30 +0200)]
mbvd-amg-pt initial
Philipp Dallig [Mon, 3 Apr 2017 14:26:13 +0000 (16:26 +0200)]
pfizer-schlaganfall - listen on two ips
Philipp Dallig [Mon, 3 Apr 2017 13:54:47 +0000 (15:54 +0200)]
pfizer-schlaganfall - correct ip adress
Philipp Dallig [Mon, 3 Apr 2017 13:41:29 +0000 (15:41 +0200)]
pfizer-schlaganfall - move htaccess to /typo3/
Andreas Gerstenberg [Mon, 3 Apr 2017 12:33:46 +0000 (14:33 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Mon, 3 Apr 2017 12:33:30 +0000 (14:33 +0200)]
sirona-aem anpassung default sprache
Hannes Eichblatt [Mon, 3 Apr 2017 12:25:35 +0000 (14:25 +0200)]
mbvd-amg-pt - initial defs {stage-,}web-amg-pt-de
Philipp Dallig [Mon, 3 Apr 2017 12:15:42 +0000 (14:15 +0200)]
pfizer-schlaganfall - Add Postfix Config
Oliver Böttcher [Mon, 3 Apr 2017 12:12:46 +0000 (14:12 +0200)]
MHK - weitere rewrites
Andreas Gerstenberg [Mon, 3 Apr 2017 12:03:55 +0000 (14:03 +0200)]
marketing-publicis-ai add user jenkins
Philipp Dallig [Mon, 3 Apr 2017 08:22:38 +0000 (10:22 +0200)]
Add Vanessa + Cleanup + Tobi is now Developer
Philipp Dallig [Mon, 3 Apr 2017 07:53:57 +0000 (09:53 +0200)]
Merge branch 'patch-27' into 'master'
Update common.yaml
See merge request !148
Christiane Deneser [Mon, 3 Apr 2017 07:50:22 +0000 (09:50 +0200)]
Update common.yaml
Torsten Ogrissek [Mon, 3 Apr 2017 07:23:34 +0000 (09:23 +0200)]
change gaia proc monitor
Torsten Ogrissek [Mon, 3 Apr 2017 06:50:09 +0000 (08:50 +0200)]
change twitter tracker monitoring
Oliver Böttcher [Sat, 1 Apr 2017 08:09:57 +0000 (10:09 +0200)]
MHK - remove htaccess
Oliver Böttcher [Sat, 1 Apr 2017 07:54:20 +0000 (09:54 +0200)]
MHK - redirects
Andreas Gerstenberg [Fri, 31 Mar 2017 14:49:14 +0000 (16:49 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Fri, 31 Mar 2017 14:48:54 +0000 (16:48 +0200)]
mbvd-transporter-topleasing-de remove webserver auth
Philipp Dallig [Fri, 31 Mar 2017 13:43:36 +0000 (15:43 +0200)]
fbb-werbung - all extern mails to andre
Andreas Gerstenberg [Fri, 31 Mar 2017 13:31:58 +0000 (15:31 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Fri, 31 Mar 2017 13:31:30 +0000 (15:31 +0200)]
sirona-aem add rewrite to sirona.clinic
Philipp Dallig [Fri, 31 Mar 2017 13:28:56 +0000 (15:28 +0200)]
fbb-werbung - correct mail
Philipp Dallig [Fri, 31 Mar 2017 13:27:38 +0000 (15:27 +0200)]
fbb-werbung - correct mailserver
Philipp Dallig [Fri, 31 Mar 2017 13:20:26 +0000 (15:20 +0200)]
fbb-werbung - rollout mailserver
Andreas Gerstenberg [Fri, 31 Mar 2017 13:01:38 +0000 (15:01 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Andreas Gerstenberg [Fri, 31 Mar 2017 13:01:23 +0000 (15:01 +0200)]
marketing-publicis-ai add env variable
Philipp Dallig [Fri, 31 Mar 2017 12:50:19 +0000 (14:50 +0200)]
fbb-werbung - add postfix server
Philipp Dallig [Fri, 31 Mar 2017 12:46:57 +0000 (14:46 +0200)]
Merge branch 'master' into 'master'
[TASK] Abgleich der System-Benutzer inkl. Jenkins (sudo apache) für alle Kölner TYPO3 Projekte
See merge request !146
Philipp Dallig [Fri, 31 Mar 2017 12:43:20 +0000 (14:43 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
projects / pixelpark / hiera.git / log