summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-01Merge branch 'develop' of ssh://leap.se/leap_platform into developelijah
2015-04-01Merge remote-tracking branch 'gitlab/develop' into developMicah Anderson
2015-04-01Merge branch 'develop' into 'develop'Micah
Adds apache support for webapp.domain if defined on :80, completes fix for #6632 See merge request !38
2015-03-31tapicero: make config compatible with 0.7elijah
2015-03-30set platform version 0.7elijah
2015-03-30added support for rotating couchdb databases.elijah
2015-03-30Adds apache support for webapp.domain if defined on :80, completes fix for #6632guido
2015-03-19don't set a lower --fragment by default yet (not compatible with android client)elijah
2015-03-18pin webapp to version/0.6.1elijah
2015-03-17updated README.md to point to installation doc of puppet-git-hooks READMEvarac
Change-Id: I3138f249167a4e0183724574971bb206b164b09a
2015-03-17updated README.md with contributing section how to use a pre-commit hook for ↵varac
syntax and style guide checking Change-Id: Ia03321d71cce39f643ec7248361c156e34fe0d09
2015-03-12require file for augeas resources in site_check_mk::agent::*varac
Change-Id: Ia5ac6f50e023d7d358d17c661b71c6a5880ec445
2015-03-12Update augeas submodule, pulling in the changes from camptocampvarac
Mainly because we want to have the augeas packages installed before any augeas resource is called, fixed by this commit: commit 616b59bead6a57f71b4b4e59aaf080cd130ab250 Author: Raphaël Pinson <raphael.pinson@camptocamp.com> Date: Thu Mar 14 09:42:08 2013 Abstract package name for ruby-augeas, define dependency for all Augeas resources see https://leap.se/code/issues/6788#note-6 Change-Id: I62af667cb93b6a9b51e1b7163d225b4ccae0312f
2015-03-11Merge branch '6612_update_soledad_check' into developvarac
2015-03-11Change nagios to be aware of soledad user change (Bug #6612)varac
Change-Id: Id53d6432a58006653f4d9ddd6355ae505a5273eb
2015-03-11Merge branch '6788_augeas_mrpe_cfg' into developvarac
2015-03-11Use augeas instead of file_line to configure entries in ↵varac
/etc/check_mk/mrpe.cfg (Bug #6788) We used file_line before, but when the some check parameters change, a new line would be added, leaving the old line there, resulting in two checks with the same name but with different parameters. Augeas can handle this better, but it is important to use 'rm' to remove all old lines with different parameters before adding the new line. Change-Id: Iad69dfd20f487a16d372a4f4a4bc53299f9e4a66
2015-03-05change default MTU to 1400 (#6745)Micah Anderson
Change-Id: Ia4b93776c6ae316b47f6e0b8e2763aa6fa9cab92
2015-03-04temporarily increase the delay between soledad / web api tests to 60 ↵elijah
minutes, until we are able to fix the issue with the test users creating db bloat.
2015-03-03pin client version to >=0.7 (#6743)Micah Anderson
Change-Id: I66f12a04bf92fbda77284665bc1186b10f4c2e15
2015-03-03Merge branch 'vagrant_install_leap_cli_from_source' into developvarac
2015-03-03Vagrant: Install leap_cli from sourcevarac
The develop branch of leap_platform needs leap_cli >= v1.6.3. The leap_cli gem is only 1.6.2, because it needs to work together with the master branch of leap_platform. Therefore we need to install leap_cli from it's develop branch from source. Change-Id: I78b433bfa31ad42f78c49949c757bcfb6cd5c30b
2015-02-26update leap archive signing key with version that expires in 2 yearsMicah Anderson
Change-Id: I0587ee6d9033824ca66b70de09e4e0f65d67cab1
2015-02-11updated LEAP archive signing key 0x1E34A1828E207901 (#6728)varac
Change-Id: I110e93a64f82e4133a043ff3fa18ab14b69a5dcc
2015-02-09Merge branch 'feature/logdeploy' into developelijah
2015-02-09logs deploy information to /var/log/leap/deploy.log (full puppet log) and ↵elijah
/var/log/leap/deploy-summary.log (just the start and complete, with platform version, user, leap_cli version, platform branch). downgrading platform require --downgrade (requires new leap_cli)
2015-02-05Merge branch 'bug/6697' into developMicah Anderson
2015-02-05add a new line between resourcesMicah Anderson
Change-Id: I7e763cfda2ebd6943b2ce3f6512bc5f5354dbc56
2015-02-04upgrade to tapicero 0.6.1, to remove auth in process list (closes #6697)elijah
2015-02-04consolidate sources into common.jsonelijah
2015-02-03Merge branch '6698_wait_for_couch_cluster' into developvarac
2015-02-03don't create dbs before couch cluster is settledvarac
Change-Id: Ifd665eb7efc06c1cf9e7b8fcfd5f42dbb34ac1b1
2015-02-03update couch-doc-update to catch a more specific exception (#6699)Micah Anderson
Change-Id: I4f7a13443574d5771ebd9dd2278ef64ba8593a7a
2015-02-03increase the sleep time for soledad testelijah
2015-02-03Merge remote-tracking branch 'elijah/feature/expire' into developMicah Anderson
Conflicts: platform.rb Change-Id: Ifb1a7579e00b1ee2bdebe86671d5c2f1cac2a8dc
2015-02-02added custom puppet function sorted_json(). closes #6389elijah
2015-02-02bumped version number from 0.6 to 0.6.1, otherwise latest leap_cli:develop ↵varac
refuses to work Change-Id: Ic11ef26f4874cf4d8e4f79d3e28cd04eee020422
2015-01-28update default provider.json to use the (now) correct expiration time ↵elijah
format. requires new leap_cli.
2015-01-27Merge branch '6674_custom_apt_sources' into developvarac
2015-01-27skip tests that require user registration if it is disabledelijah
2015-01-27provide way to customize all three apt sources urls (basic, security, backports)varac
Change-Id: I5542b320bb1edb52c63350b5e4fd2af681991fb5
2015-01-27use apt.url hiera value for customizing apt sources urlvarac
Change-Id: Ib18c9031df13dab3187e0bb0f2202ffddd0d228d
2015-01-27provide apt.url key that can be customized in provider.jsonvarac
Change-Id: Ic8bcca7fde25b4eb540aab8cc4114748b9b2cfd7
2015-01-27Merge remote-tracking branch 'varacgitlab/6659_install_git_before_vcsrepo' ↵Micah Anderson
into develop
2015-01-27update stdlib to latest version to address cve-2015-1029 (#6666)Micah Anderson
Change-Id: Ibd39797484b86b7254b534693fdfc3b0c15122e3
2015-01-27vcsrepo should depend on git package (Bug #6659)varac
Change-Id: Ibc2ae4697a37af97de625bfc9d8e149306578321
2015-01-27Update nagios submodule to get fix for pnp4nagios dependency problem (#6660)Micah Anderson
Change-Id: I395c90f3b1e2d412e73c9e07552827d7d8b31010
2015-01-27Merge remote-tracking branch 'gitlab/develop' into developMicah Anderson
2015-01-27Merge branch 'develop' into 'develop'Micah
Develop See merge request !30
2015-01-27Merge remote-tracking branch 'gitlab/develop' into developMicah Anderson
Change-Id: I10b77ee0f6ef8c5aec15b5430ae98fd791c220ac