]>
Frank Brehm's Git Trees - pixelpark/hiera.git/log
Markus Baumann [Mon, 26 Sep 2016 08:40:55 +0000 (10:40 +0200)]
BKKVBU Set database credentials for symfony forms in server environment vars
Thomas Heller [Fri, 23 Sep 2016 13:51:51 +0000 (15:51 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Thomas Heller [Fri, 23 Sep 2016 13:50:41 +0000 (15:50 +0200)]
BJE - typo3 cms update
samuel.bufe [Fri, 23 Sep 2016 11:30:09 +0000 (13:30 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Thomas Heller [Fri, 23 Sep 2016 10:01:06 +0000 (12:01 +0200)]
pfizer - changed yaml config + added user c.baer
samuel.bufe [Fri, 23 Sep 2016 08:52:27 +0000 (10:52 +0200)]
disabled buggy kibana config
Thomas Heller [Fri, 23 Sep 2016 08:46:00 +0000 (10:46 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Thomas Heller [Fri, 23 Sep 2016 08:43:31 +0000 (10:43 +0200)]
bmbf - typo3 cms update
samuel.bufe [Fri, 23 Sep 2016 08:13:43 +0000 (10:13 +0200)]
updated search guard
Thomas Heller [Fri, 23 Sep 2016 07:58:42 +0000 (09:58 +0200)]
bmbf - typo3 update
Thomas Heller [Thu, 22 Sep 2016 14:06:03 +0000 (16:06 +0200)]
changed config for bat.pp.net
Thomas Heller [Thu, 22 Sep 2016 14:04:06 +0000 (16:04 +0200)]
changed config
Thomas Heller [Thu, 22 Sep 2016 13:39:56 +0000 (15:39 +0200)]
config changes
Andreas Gerstenberg [Thu, 22 Sep 2016 13:30:47 +0000 (15:30 +0200)]
Merge branch 'feature/sirona-prod-deployment-0.17.5' into 'master'
sirona - Update package versions to hotfix 0.17.4 / 0.17.5 for PROD
See merge request !74
Victor Saar [Thu, 22 Sep 2016 13:02:42 +0000 (15:02 +0200)]
sirona - Update package versions to hotfix 0.17.4 / 0.17.5 for PROD
Oliver Böttcher [Wed, 21 Sep 2016 13:28:45 +0000 (15:28 +0200)]
bauhaus: proxy timeout - as string
Oliver Böttcher [Wed, 21 Sep 2016 13:21:11 +0000 (15:21 +0200)]
bauhaus: proxy timeout
Andreas Gerstenberg [Wed, 21 Sep 2016 13:12:04 +0000 (15:12 +0200)]
udpate vhost + map for instruments-made-in-germany
Hannes Eichblatt [Wed, 21 Sep 2016 12:08:37 +0000 (14:08 +0200)]
pfizer - new user christian.baer SERVICEDESK-611
Oliver Böttcher [Wed, 21 Sep 2016 10:43:59 +0000 (12:43 +0200)]
bmwi: eMag
Oliver Böttcher [Wed, 21 Sep 2016 10:20:10 +0000 (12:20 +0200)]
bmwi: bmwi.delivery für eMag
Andreas Gerstenberg [Wed, 21 Sep 2016 09:56:28 +0000 (11:56 +0200)]
remove double aem mappging for instruments-made-in-germany
Oliver Böttcher [Wed, 21 Sep 2016 09:48:35 +0000 (11:48 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Oliver Böttcher [Wed, 21 Sep 2016 09:48:28 +0000 (11:48 +0200)]
bmwi: bmwi.delivery für eMag
Andreas Gerstenberg [Wed, 21 Sep 2016 09:43:48 +0000 (11:43 +0200)]
bugfix
Andreas Gerstenberg [Wed, 21 Sep 2016 09:39:31 +0000 (11:39 +0200)]
add vhosts and mappings for my.cerec.com + instruments-made-in-germany.com
Oliver Böttcher [Tue, 20 Sep 2016 13:55:07 +0000 (15:55 +0200)]
BMWI: test eMag
Oliver Böttcher [Tue, 20 Sep 2016 13:53:53 +0000 (15:53 +0200)]
BMWI: test eMag
Thomas Heller [Tue, 20 Sep 2016 13:42:58 +0000 (15:42 +0200)]
typo3 security patch
Thomas Heller [Tue, 20 Sep 2016 12:18:48 +0000 (14:18 +0200)]
updated typo3 for dev and live
Andreas Gerstenberg [Tue, 20 Sep 2016 11:58:56 +0000 (13:58 +0200)]
update typo3 core to 6.2.27
Andreas Gerstenberg [Tue, 20 Sep 2016 11:55:03 +0000 (13:55 +0200)]
update typo3 core to 6.2.27
Thomas Heller [Tue, 20 Sep 2016 11:53:49 +0000 (13:53 +0200)]
updated typo3 version
Andreas Gerstenberg [Tue, 20 Sep 2016 10:00:57 +0000 (12:00 +0200)]
add dns entry test-redaktion-pain-detect-de.pixelpark.net
Thomas Heller [Tue, 20 Sep 2016 09:08:15 +0000 (11:08 +0200)]
decreased php mem limit
Andreas Gerstenberg [Tue, 20 Sep 2016 08:56:57 +0000 (10:56 +0200)]
update typo3 core to 6.2.27
Thomas Heller [Tue, 20 Sep 2016 08:54:29 +0000 (10:54 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Thomas Heller [Tue, 20 Sep 2016 08:54:00 +0000 (10:54 +0200)]
increased php memory limit for redaktion pfizer
Andreas Gerstenberg [Tue, 20 Sep 2016 08:52:24 +0000 (10:52 +0200)]
update typo3 core to 6.2.27
Andreas Gerstenberg [Tue, 20 Sep 2016 08:49:47 +0000 (10:49 +0200)]
update typo3 core to 6.2.27
Thomas Heller [Mon, 19 Sep 2016 14:47:05 +0000 (16:47 +0200)]
typo3 security update
Thomas Heller [Mon, 19 Sep 2016 14:35:41 +0000 (16:35 +0200)]
typo3 cms update
Andreas Gerstenberg [Mon, 19 Sep 2016 13:46:14 +0000 (15:46 +0200)]
add spotlight.dentsplysirona.com virtualhost and mapping
Oliver Böttcher [Mon, 19 Sep 2016 12:10:33 +0000 (14:10 +0200)]
bmas: sgb2 web02 entfernt
Thomas Dalichow [Fri, 16 Sep 2016 13:27:00 +0000 (15:27 +0200)]
Sirona - Prod rewrite fuer danke-m1 - this time in: production.yaml
Thomas Dalichow [Fri, 16 Sep 2016 13:25:34 +0000 (15:25 +0200)]
Revert "Sirona - Prod rewrite fuer danke-m1"
This reverts commit
dbc8749b8007ef334cd7d4f7d146060bd081c9c6.
prod.yaml is the YAML file for the 6.1 version of AEM, 6.2 version is production.yaml
Thomas Dalichow [Fri, 16 Sep 2016 12:03:56 +0000 (14:03 +0200)]
Sirona - Prod rewrite fuer danke-m1
Thomas Dalichow [Thu, 15 Sep 2016 11:01:54 +0000 (13:01 +0200)]
Emperra - add ccount 'dahl', RT#145569
Hannes Eichblatt [Thu, 15 Sep 2016 10:31:08 +0000 (12:31 +0200)]
Merge branch 'feature/sirona-dispatcher-rules' into 'master'
sirona - Allow requests to generic asset JSON API
New dispatcher filter rules that allow access to a JSON API endpoint.
See merge request !70
Hannes Eichblatt [Thu, 15 Sep 2016 09:34:18 +0000 (11:34 +0200)]
docmorris - tobias.rotter DOCMHS-596
Hannes Eichblatt [Thu, 15 Sep 2016 09:29:20 +0000 (11:29 +0200)]
docmorris - revert
690a44a
Hannes Eichblatt [Thu, 15 Sep 2016 09:27:38 +0000 (11:27 +0200)]
docmorris axel.knauf@prd-qas-web01-dm-kampagne DOCMHS-596
Thomas Dalichow [Thu, 15 Sep 2016 09:09:04 +0000 (11:09 +0200)]
Emperra - Fix: add to group emperra, instead of 'pixel'
Thomas Dalichow [Thu, 15 Sep 2016 09:05:13 +0000 (11:05 +0200)]
Emperra - m2madmin-Nutzer hinzufuegen, RT#145574
Hannes Eichblatt [Wed, 14 Sep 2016 15:16:17 +0000 (17:16 +0200)]
docmorris - initial def prd-qas-web01-dm-kampagne
Ivan Prikhodko [Tue, 13 Sep 2016 13:30:24 +0000 (15:30 +0200)]
sirona - int - aem: increased heap
Thomas Heller [Mon, 12 Sep 2016 13:26:31 +0000 (15:26 +0200)]
bmbf - changed php values
Ivan Prikhodko [Mon, 12 Sep 2016 12:58:40 +0000 (14:58 +0200)]
Merge branch 'feature/sirona-prod-deployment-0.17.4' into 'master'
sirona - Update package versions to hotfix 0.17.3 / 0.17.4 for PROD
See merge request !72
Victor Saar [Mon, 12 Sep 2016 12:15:32 +0000 (14:15 +0200)]
sirona - Update package versions to hotfix 0.17.3 / 0.17.4 for PROD
Thomas Heller [Mon, 12 Sep 2016 10:15:11 +0000 (12:15 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Thomas Heller [Mon, 12 Sep 2016 10:14:42 +0000 (12:14 +0200)]
so-klingt-europa - increased php mem limit
Ivan Prikhodko [Mon, 12 Sep 2016 10:03:10 +0000 (12:03 +0200)]
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
Thomas Heller [Mon, 12 Sep 2016 09:53:35 +0000 (11:53 +0200)]
service and smile - increased php memory limit
Ivan Prikhodko [Mon, 12 Sep 2016 09:45:20 +0000 (11:45 +0200)]
aem - increased mem
Thomas Heller [Mon, 12 Sep 2016 09:00:54 +0000 (11:00 +0200)]
bmbf - wissenschaftsjahr - changed php values
Thomas Heller [Fri, 9 Sep 2016 13:36:39 +0000 (15:36 +0200)]
added vhost
Thomas Heller [Fri, 9 Sep 2016 13:33:03 +0000 (15:33 +0200)]
added vhost
Thomas Heller [Fri, 9 Sep 2016 13:30:12 +0000 (15:30 +0200)]
added vhost
Thomas Heller [Fri, 9 Sep 2016 13:28:37 +0000 (15:28 +0200)]
addes vhost
Thomas Heller [Fri, 9 Sep 2016 13:08:13 +0000 (15:08 +0200)]
Merge branch 'patch-8' into 'master'
Update test.yaml; jvm_heap_min und jvm_heap_max gesetzt.
See merge request !71
Klaus Kuntz [Fri, 9 Sep 2016 13:05:52 +0000 (15:05 +0200)]
Update test.yaml; jvm_heap_min und jvm_heap_max gesetzt.
Thomas Heller [Fri, 9 Sep 2016 13:04:09 +0000 (15:04 +0200)]
added vhost
Thomas Heller [Fri, 9 Sep 2016 13:01:08 +0000 (15:01 +0200)]
added vhost
samuel.bufe [Fri, 9 Sep 2016 11:32:51 +0000 (13:32 +0200)]
changed kibana settings
samuel.bufe [Fri, 9 Sep 2016 09:46:27 +0000 (11:46 +0200)]
added kibana and ssl settings
samuel.bufe [Fri, 9 Sep 2016 08:36:10 +0000 (10:36 +0200)]
changed ssl settings
Victor Saar [Thu, 8 Sep 2016 12:19:27 +0000 (14:19 +0200)]
sirona - Allow requests to generic asset JSON API
Hannes Eichblatt [Thu, 8 Sep 2016 12:02:57 +0000 (14:02 +0200)]
Merge branch 'patch-7' into 'master'
Update test.yaml; acs_aem_tools und sirona_taxonomy in aem::packages hinzugefügt
See merge request !69
Klaus Kuntz [Thu, 8 Sep 2016 12:01:34 +0000 (14:01 +0200)]
Update test.yaml; acs_aem_tools und sirona_taxonomy in aem::packages hinzugefügt
samuel.bufe [Wed, 7 Sep 2016 14:32:47 +0000 (16:32 +0200)]
fixed ssl output again
samuel.bufe [Wed, 7 Sep 2016 14:22:38 +0000 (16:22 +0200)]
fixed ssl output
Thomas Heller [Wed, 7 Sep 2016 08:37:16 +0000 (10:37 +0200)]
added r.pohl to dev-bkk
samuel.bufe [Mon, 5 Sep 2016 13:17:24 +0000 (15:17 +0200)]
added https
Thomas Heller [Mon, 5 Sep 2016 12:13:27 +0000 (14:13 +0200)]
added cert for fis-netzwerk
Thomas Heller [Mon, 5 Sep 2016 11:25:04 +0000 (13:25 +0200)]
changed conf
Thomas Heller [Mon, 5 Sep 2016 11:20:32 +0000 (13:20 +0200)]
changed conf
samuel.bufe [Mon, 5 Sep 2016 10:07:30 +0000 (12:07 +0200)]
pinned elasticsearch version
Thomas Heller [Mon, 5 Sep 2016 09:55:49 +0000 (11:55 +0200)]
added ssh-key for j.vollmer
Thomas Heller [Mon, 5 Sep 2016 08:24:00 +0000 (10:24 +0200)]
changed keys for ch.hoefler
Thomas Heller [Fri, 2 Sep 2016 15:20:30 +0000 (17:20 +0200)]
config changes pass.pp.com
Thomas Heller [Fri, 2 Sep 2016 14:55:24 +0000 (16:55 +0200)]
config changes pass.pp.com
Thomas Heller [Fri, 2 Sep 2016 14:49:26 +0000 (16:49 +0200)]
config changes pass.pp.com
Thomas Heller [Fri, 2 Sep 2016 14:26:21 +0000 (16:26 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
Thomas Heller [Fri, 2 Sep 2016 14:25:42 +0000 (16:25 +0200)]
setup pass.pp.com
Andreas Gerstenberg [Fri, 2 Sep 2016 13:13:13 +0000 (15:13 +0200)]
sirona-aem - correct domain mapping for ledview + integoturn
Thomas Heller [Fri, 2 Sep 2016 13:00:48 +0000 (15:00 +0200)]
added new serveralias dev-styleguide
Andreas Gerstenberg [Fri, 2 Sep 2016 12:42:48 +0000 (14:42 +0200)]
sirona-aem added vhosts for levdiew + integoturn
samuel.bufe [Fri, 2 Sep 2016 12:25:23 +0000 (14:25 +0200)]
Merge branch 'master' of git.pixelpark.com:puppet/hiera
samuel.bufe [Fri, 2 Sep 2016 12:24:59 +0000 (14:24 +0200)]
added searchguard config
Thomas Heller [Fri, 2 Sep 2016 11:42:06 +0000 (13:42 +0200)]
added config for pass.pp.com
projects / pixelpark / hiera.git / log