]> Frank Brehm's Git Trees - pixelpark/hiera.git/log
pixelpark/hiera.git
8 years agorapunzel: changed memory settings
Sven Marcel Buchholz [Thu, 9 Jun 2016 07:19:21 +0000 (09:19 +0200)]
rapunzel: changed memory settings

8 years agorapunzel: add work_mem
Sven Marcel Buchholz [Thu, 9 Jun 2016 06:27:33 +0000 (08:27 +0200)]
rapunzel: add work_mem

8 years agochange name of vhost
Philipp Dallig [Thu, 9 Jun 2016 05:31:45 +0000 (07:31 +0200)]
change name of vhost

8 years agoAdd an extra default vhost
Philipp Dallig [Thu, 9 Jun 2016 05:28:02 +0000 (07:28 +0200)]
Add an extra default vhost

8 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Wed, 8 Jun 2016 16:26:21 +0000 (18:26 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

8 years agofbb - anpassung storelocation
Philipp Dallig [Wed, 8 Jun 2016 16:26:15 +0000 (18:26 +0200)]
fbb - anpassung storelocation

8 years agoMerge branch 'feature/sirona-acs-aem-commons-package' into 'master'
Philipp Dallig [Wed, 8 Jun 2016 14:48:27 +0000 (16:48 +0200)]
Merge branch 'feature/sirona-acs-aem-commons-package' into 'master'

SIRONAADFR-261: Add ACS AEM Commons package

See merge request !24

8 years agoowasp-zap - rollout stephan
Philipp Dallig [Wed, 8 Jun 2016 14:39:40 +0000 (16:39 +0200)]
owasp-zap - rollout stephan

8 years agoMerge
Hannes Eichblatt [Wed, 8 Jun 2016 13:44:12 +0000 (15:44 +0200)]
Merge

8 years agowebstats - initial defs test-webstats
Hannes Eichblatt [Wed, 8 Jun 2016 13:39:34 +0000 (15:39 +0200)]
webstats - initial defs test-webstats

8 years agosirona-aem - correct authname
Philipp Dallig [Wed, 8 Jun 2016 13:19:17 +0000 (15:19 +0200)]
sirona-aem - correct authname

8 years agoSIRONAADFR-261: Add ACS AEM Commons package
Victor Saar [Wed, 8 Jun 2016 12:36:54 +0000 (14:36 +0200)]
SIRONAADFR-261: Add ACS AEM Commons package

8 years agofbb - BERFBB-2237
Philipp Dallig [Wed, 8 Jun 2016 11:43:11 +0000 (13:43 +0200)]
fbb - BERFBB-2237

8 years agofbb - BERFBB-2237 Deployment
Philipp Dallig [Wed, 8 Jun 2016 11:34:05 +0000 (13:34 +0200)]
fbb - BERFBB-2237 Deployment

8 years agopixelpark - initial defs psql-pp02
Hannes Eichblatt [Wed, 8 Jun 2016 11:27:31 +0000 (13:27 +0200)]
pixelpark - initial defs psql-pp02

8 years agobmbf - correct typo
Philipp Dallig [Tue, 7 Jun 2016 15:20:41 +0000 (17:20 +0200)]
bmbf - correct typo

8 years agobmbf - set flow context
Philipp Dallig [Tue, 7 Jun 2016 15:18:26 +0000 (17:18 +0200)]
bmbf - set flow context

8 years agobmbf - change header
Philipp Dallig [Tue, 7 Jun 2016 15:07:23 +0000 (17:07 +0200)]
bmbf - change header

8 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Tue, 7 Jun 2016 14:47:57 +0000 (16:47 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

8 years agobmbf - change cronjob minute + flow context
Philipp Dallig [Tue, 7 Jun 2016 14:47:40 +0000 (16:47 +0200)]
bmbf - change cronjob minute + flow context

8 years agobmf test wait_timeout
Oliver Böttcher [Tue, 7 Jun 2016 12:22:51 +0000 (14:22 +0200)]
bmf test wait_timeout

8 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Oliver Böttcher [Tue, 7 Jun 2016 11:52:47 +0000 (13:52 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

8 years agobmf test wait_timeout
Oliver Böttcher [Tue, 7 Jun 2016 11:52:40 +0000 (13:52 +0200)]
bmf test wait_timeout

8 years agolekkerland - initial defs dev-lekker-0{1,2}-hy01
Hannes Eichblatt [Tue, 7 Jun 2016 11:49:58 +0000 (13:49 +0200)]
lekkerland - initial defs dev-lekker-0{1,2}-hy01

8 years agobmf test wait_timeout
Oliver Böttcher [Tue, 7 Jun 2016 11:39:03 +0000 (13:39 +0200)]
bmf test wait_timeout

8 years agospd - give sudo rights on dev
Philipp Dallig [Tue, 7 Jun 2016 11:30:30 +0000 (13:30 +0200)]
spd - give sudo rights on dev

8 years agoadd maschine fqdn to bundeshaushalt-info for urchin logs
Philipp Dallig [Tue, 7 Jun 2016 09:15:24 +0000 (11:15 +0200)]
add maschine fqdn to bundeshaushalt-info for urchin logs

8 years agopuppetmater - use phusion-passenger rpm
Philipp Dallig [Mon, 6 Jun 2016 16:39:04 +0000 (18:39 +0200)]
puppetmater - use phusion-passenger rpm

8 years agopixelpark - puppetmaster add passenger-repo
Philipp Dallig [Mon, 6 Jun 2016 16:09:24 +0000 (18:09 +0200)]
pixelpark - puppetmaster add passenger-repo

8 years agoMerge branch 'feature/sirona-int-deployment-0.7' into 'master'
Philipp Dallig [Mon, 6 Jun 2016 14:25:39 +0000 (16:25 +0200)]
Merge branch 'feature/sirona-int-deployment-0.7' into 'master'

sirona - Update package versions to release 0.7 for INT

See merge request !23

8 years agosirona - Update package versions to release 0.7 for INT
Victor Saar [Mon, 6 Jun 2016 14:08:30 +0000 (16:08 +0200)]
sirona - Update package versions to release 0.7 for INT

8 years agoset shared buffers to 2G, part two
Sven Marcel Buchholz [Mon, 6 Jun 2016 11:27:53 +0000 (13:27 +0200)]
set shared buffers to 2G, part two

8 years agoset shared buffers to 2G
Sven Marcel Buchholz [Mon, 6 Jun 2016 11:23:05 +0000 (13:23 +0200)]
set shared buffers to 2G

8 years agoencrypt meep-pw
Sven Marcel Buchholz [Mon, 6 Jun 2016 10:52:12 +0000 (12:52 +0200)]
encrypt meep-pw

8 years agoencrypt pgpassword
Sven Marcel Buchholz [Mon, 6 Jun 2016 10:47:15 +0000 (12:47 +0200)]
encrypt pgpassword

8 years agorelease 9.4 => 9.5
Sven Marcel Buchholz [Mon, 6 Jun 2016 10:38:21 +0000 (12:38 +0200)]
release 9.4 => 9.5

8 years agoadd db troet part two
Sven Marcel Buchholz [Mon, 6 Jun 2016 10:31:25 +0000 (12:31 +0200)]
add db troet part two

8 years agoadd db troet
Sven Marcel Buchholz [Mon, 6 Jun 2016 10:28:28 +0000 (12:28 +0200)]
add db troet

8 years agoRapunzel PG-Test
Sven Marcel Buchholz [Mon, 6 Jun 2016 10:13:22 +0000 (12:13 +0200)]
Rapunzel PG-Test

8 years agoadded new ssh key for daniel.kurre
Thomas Heller [Fri, 3 Jun 2016 13:35:34 +0000 (15:35 +0200)]
added new ssh key for daniel.kurre

8 years agoprometheus - Xymon-Warnungslevel weiter erhöht
Hannes Eichblatt [Fri, 3 Jun 2016 12:13:35 +0000 (14:13 +0200)]
prometheus - Xymon-Warnungslevel weiter erhöht

8 years agoprometheus - Xymon-Warnungen angepasst
Hannes Eichblatt [Fri, 3 Jun 2016 11:58:31 +0000 (13:58 +0200)]
prometheus - Xymon-Warnungen angepasst

8 years agoprometheus - Xymon-Warnungen angepasst
Hannes Eichblatt [Fri, 3 Jun 2016 11:55:44 +0000 (13:55 +0200)]
prometheus - Xymon-Warnungen angepasst

8 years agoadded bmf test-db env
Thomas Heller [Fri, 3 Jun 2016 08:15:29 +0000 (10:15 +0200)]
added bmf test-db env

8 years agoadded nimue.pixelpark.net
Sven Marcel Buchholz [Fri, 3 Jun 2016 07:48:36 +0000 (09:48 +0200)]
added nimue.pixelpark.net

8 years agopfizer - live ueberkative blase rewrite to www.pfizer.de
Steve Rosiak [Thu, 2 Jun 2016 08:41:19 +0000 (10:41 +0200)]
pfizer - live ueberkative blase rewrite to www.pfizer.de

8 years agopfizer - live ueberkative blase rewrite to www.pfizer.de
Steve Rosiak [Thu, 2 Jun 2016 08:34:03 +0000 (10:34 +0200)]
pfizer - live ueberkative blase rewrite to www.pfizer.de

8 years agopfizer - test ueberkative blase rewrite to test-www.pfizer.de
Steve Rosiak [Thu, 2 Jun 2016 08:20:16 +0000 (10:20 +0200)]
pfizer - test ueberkative blase rewrite to test-www.pfizer.de

8 years agopfizer - dev ueberkative blase rewrite to dev-www.pfizer.de
Steve Rosiak [Thu, 2 Jun 2016 08:09:33 +0000 (10:09 +0200)]
pfizer - dev ueberkative blase rewrite to dev-www.pfizer.de

8 years agopfizer - dev ueberkative blase rewrite to dev-www.pfizer.de
Steve Rosiak [Thu, 2 Jun 2016 08:02:09 +0000 (10:02 +0200)]
pfizer - dev ueberkative blase rewrite to dev-www.pfizer.de

8 years agopfizer - dev ueberkative blase rewrite to dev-[H#www.pfizer.de
Steve Rosiak [Thu, 2 Jun 2016 08:00:27 +0000 (10:00 +0200)]
pfizer - dev ueberkative blase rewrite to dev-[H#www.pfizer.de

8 years agoBMBF: WJ all to https
Oliver Böttcher [Wed, 1 Jun 2016 13:39:45 +0000 (15:39 +0200)]
BMBF: WJ all to https

8 years agoBMBF: WJ all to https
Oliver Böttcher [Wed, 1 Jun 2016 13:36:48 +0000 (15:36 +0200)]
BMBF: WJ all to https

8 years agoBMBF: WJ auskommentiert
Oliver Böttcher [Wed, 1 Jun 2016 13:10:47 +0000 (15:10 +0200)]
BMBF: WJ auskommentiert

8 years agoadded nerio.pixelpark.net.yaml
Sven Marcel Buchholz [Wed, 1 Jun 2016 08:25:55 +0000 (10:25 +0200)]
added nerio.pixelpark.net.yaml

8 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
nils.wagner [Wed, 1 Jun 2016 08:11:49 +0000 (10:11 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

8 years agospk-paydirekt - added htaccess user
nils.wagner [Wed, 1 Jun 2016 08:11:46 +0000 (10:11 +0200)]
spk-paydirekt - added htaccess user

8 years agombvd: mannschaftsbusse rewrite
Oliver Böttcher [Wed, 1 Jun 2016 08:04:12 +0000 (10:04 +0200)]
mbvd: mannschaftsbusse rewrite

8 years agombvd: mannschaftsbusse rewrite
Oliver Böttcher [Wed, 1 Jun 2016 07:56:16 +0000 (09:56 +0200)]
mbvd: mannschaftsbusse rewrite

8 years agombvd-mannschaftsbusse - add an additional alias
Philipp Dallig [Tue, 31 May 2016 15:56:02 +0000 (17:56 +0200)]
mbvd-mannschaftsbusse - add an additional alias

8 years agombvd-mannschaftsbusse - remove htaccess
Philipp Dallig [Tue, 31 May 2016 15:50:57 +0000 (17:50 +0200)]
mbvd-mannschaftsbusse - remove htaccess

8 years agobmwi-gruenderwoche - increase timeout
Philipp Dallig [Tue, 31 May 2016 14:37:47 +0000 (16:37 +0200)]
bmwi-gruenderwoche - increase timeout

8 years agofbb - update hosting paket
Philipp Dallig [Tue, 31 May 2016 13:46:23 +0000 (15:46 +0200)]
fbb - update hosting paket

8 years agobmbf - adjust cron job + fallbackresource
Philipp Dallig [Tue, 31 May 2016 13:28:07 +0000 (15:28 +0200)]
bmbf - adjust cron job + fallbackresource

8 years agobmbf - prelive
Philipp Dallig [Tue, 31 May 2016 13:03:50 +0000 (15:03 +0200)]
bmbf - prelive

8 years agoowas-zap - correct cert name
Philipp Dallig [Tue, 31 May 2016 10:33:05 +0000 (12:33 +0200)]
owas-zap - correct cert name

8 years agocorrect owasp-zap
Philipp Dallig [Tue, 31 May 2016 10:28:05 +0000 (12:28 +0200)]
correct owasp-zap

8 years agoowasp correction
Philipp Dallig [Tue, 31 May 2016 10:25:20 +0000 (12:25 +0200)]
owasp correction

8 years agoAdd apache to owasp
Philipp Dallig [Tue, 31 May 2016 10:24:29 +0000 (12:24 +0200)]
Add apache to owasp

8 years agosirona-aem - anpassung der test und prod apaches
Philipp Dallig [Tue, 31 May 2016 09:04:08 +0000 (11:04 +0200)]
sirona-aem - anpassung der test und prod apaches

8 years agosirona-aem - anpassungen am vhost
Philipp Dallig [Tue, 31 May 2016 08:58:41 +0000 (10:58 +0200)]
sirona-aem - anpassungen am vhost

8 years agosirona-aem - victor.saar on int
Philipp Dallig [Tue, 31 May 2016 08:26:09 +0000 (10:26 +0200)]
sirona-aem - victor.saar on int

8 years agoAEM add Access-Control-Allow-Origin Header
Philipp Dallig [Tue, 31 May 2016 08:03:47 +0000 (10:03 +0200)]
AEM add Access-Control-Allow-Origin Header

8 years agoadded new key for daniel.kurre
Thomas Heller [Mon, 30 May 2016 14:47:35 +0000 (16:47 +0200)]
added new key for daniel.kurre

8 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Thomas Heller [Mon, 30 May 2016 14:22:37 +0000 (16:22 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

8 years agodeleted express htaccess
Thomas Heller [Mon, 30 May 2016 14:19:53 +0000 (16:19 +0200)]
deleted express htaccess

8 years agosirona-aem - install our packages
Philipp Dallig [Mon, 30 May 2016 14:10:57 +0000 (16:10 +0200)]
sirona-aem - install our packages

8 years agosirona-aem - add license information
Philipp Dallig [Mon, 30 May 2016 13:44:01 +0000 (15:44 +0200)]
sirona-aem - add license information

8 years agosirona-aem - fix typo
Philipp Dallig [Mon, 30 May 2016 13:25:44 +0000 (15:25 +0200)]
sirona-aem - fix typo

8 years agosirona-aem - disable apache for author
Philipp Dallig [Mon, 30 May 2016 13:23:44 +0000 (15:23 +0200)]
sirona-aem - disable apache for author

8 years agosirona-aem - install aem on new server
Philipp Dallig [Mon, 30 May 2016 13:22:44 +0000 (15:22 +0200)]
sirona-aem - install aem on new server

8 years agochanged passenger conf
Thomas Heller [Mon, 30 May 2016 12:18:54 +0000 (14:18 +0200)]
changed passenger conf

8 years agochanged bkk config
Thomas Heller [Mon, 30 May 2016 11:56:29 +0000 (13:56 +0200)]
changed bkk config

8 years agoowasp-zap - initial definition
Hannes Eichblatt [Mon, 30 May 2016 11:43:33 +0000 (13:43 +0200)]
owasp-zap - initial definition

8 years agoadded user to symfony
Thomas Heller [Mon, 30 May 2016 10:59:32 +0000 (12:59 +0200)]
added user to symfony

8 years agochanged config
Thomas Heller [Mon, 30 May 2016 10:50:40 +0000 (12:50 +0200)]
changed config

8 years agochanged conf
Thomas Heller [Mon, 30 May 2016 10:31:38 +0000 (12:31 +0200)]
changed conf

8 years agoMerge branch 'master' of git.pixelpark.com:puppet/hiera
Philipp Dallig [Mon, 30 May 2016 10:07:29 +0000 (12:07 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera

8 years agoRevert "Update Sonar"
Philipp Dallig [Mon, 30 May 2016 10:07:15 +0000 (12:07 +0200)]
Revert "Update Sonar"

This reverts commit 7514bfa7d96c383eced0cb145b3acbe6907c4861.

8 years agochanged symfony conf
Thomas Heller [Mon, 30 May 2016 09:54:56 +0000 (11:54 +0200)]
changed symfony conf

8 years agoMerge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Philipp Dallig [Mon, 30 May 2016 09:52:44 +0000 (11:52 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

8 years agoUpdate Sonar
Philipp Dallig [Mon, 30 May 2016 09:52:38 +0000 (11:52 +0200)]
Update Sonar

8 years agoadded cms database
Thomas Heller [Mon, 30 May 2016 09:51:28 +0000 (11:51 +0200)]
added cms database

8 years agochanged config. new vhosts, symfony host etc
Thomas Heller [Mon, 30 May 2016 09:38:56 +0000 (11:38 +0200)]
changed config. new vhosts, symfony host etc

8 years agosirona-aem - add Access-Control-Allow-Origin to dev and test
Philipp Dallig [Mon, 30 May 2016 09:09:27 +0000 (11:09 +0200)]
sirona-aem - add Access-Control-Allow-Origin to dev and test

8 years agosirona-aem - header correction
Philipp Dallig [Mon, 30 May 2016 08:39:24 +0000 (10:39 +0200)]
sirona-aem - header correction

8 years agosirona-aem - correct typo
Philipp Dallig [Mon, 30 May 2016 08:35:17 +0000 (10:35 +0200)]
sirona-aem - correct typo

8 years agosirona-aem - Access-Control-Allow-Origin-Header SIRONAADFR-243
Philipp Dallig [Mon, 30 May 2016 08:33:06 +0000 (10:33 +0200)]
sirona-aem - Access-Control-Allow-Origin-Header SIRONAADFR-243

8 years agobmbf - correct auth
Philipp Dallig [Fri, 27 May 2016 15:36:21 +0000 (17:36 +0200)]
bmbf - correct auth

8 years agobmbf - change servernameon test
Philipp Dallig [Fri, 27 May 2016 15:24:15 +0000 (17:24 +0200)]
bmbf - change servernameon test