Commit graph

882 commits

Author SHA1 Message Date
Nico Schottelius
0cf170b18e prettier print when requirements are broken
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-02-10 21:59:39 +01:00
Nico Schottelius
f2b1c24ec3 Merge pull request #382 from acatton/fix-dir-in-default
Cdist fails silently when there's a directory in __type/parameter/default
2015-01-09 11:30:25 +01:00
Nico Schottelius
42c393ca40 add ubuntu support to __locale
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-01-06 15:35:30 +01:00
Antoine Catton
2318c792d7 Fix test cdist_type.TypeTestCase.test_directory_in_default 2015-01-04 12:43:57 -07:00
Antoine Catton
9717d5d928 Add test case: what if there's a directory in defaults
The goal of the directory name is to be before foo and bar
2015-01-04 12:43:57 -07:00
Antoine Catton
a938468bb0 DRY: Remove default parameter value handeling in __package_rubygem 2014-12-27 20:48:42 -07:00
Antoine Catton
33cc3b0fa2 DRY: Remove default parameter value handeling in __package_pkg_openbsd 2014-12-27 20:47:30 -07:00
Antoine Catton
ebf0479f60 DRY: Remove default parameter value handeling in __package_pkgng_freebsd
flavor, repo and version are expected to be empty by default.
They're all checked with [ -n "$var" ]
2014-12-27 20:44:47 -07:00
Antoine Catton
f7bf6a058e DRY: Remove default parameter value handeling in __package_pkg_freebsd
flavor, pkgsite and version are expected to be empty.
They're all checked with [ -n "$var" ]
2014-12-27 20:42:03 -07:00
Antoine Catton
9fd285da4c DRY: Remove default parameter value handeling in __package_pip 2014-12-27 20:35:53 -07:00
Antoine Catton
5aaea37194 DRY: Remove default parameter value handeling in __package_pacman 2014-12-27 20:34:38 -07:00
Antoine Catton
65f50b64b7 DRY: Remove default parameter value handeling in __package_opkg 2014-12-27 20:32:49 -07:00
Antoine Catton
de282c50f3 DRY: Remove default parameter value handeling in __package_luarocks 2014-12-27 20:31:46 -07:00
Antoine Catton
601346d482 DRY: Remove default parameter value handeling in __package_apt 2014-12-27 20:29:45 -07:00
Antoine Catton
0844f717a8 Password is unused in the else branch 2014-12-27 20:26:29 -07:00
Antoine Catton
82f48ef271 DRY: Remove default parameter value handeling in __apt_source 2014-12-27 20:12:34 -07:00
Antoine Catton
17afb5f5ad DRY: Remove default parameter value handeling in __apt_source 2014-12-27 20:12:29 -07:00
Nico Schottelius
77b96b97c8 fix #343 - close fds of mkstemp for messages
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2014-12-09 19:54:49 +01:00
Nico Schottelius
dd562befc9 add support for --target-release for __package_apt
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2014-11-25 23:00:17 +01:00
Nico Schottelius
38d27d8769 Merge branch 'issue/372' of https://github.com/asteven/cdist 2014-10-23 16:27:52 +09:00
Nico Schottelius
4a0380ab65 Merge branch 'issue/369' of https://github.com/asteven/cdist 2014-10-23 16:27:29 +09:00
Steven Armstrong
28027f4261 dont fail just because grep in subshell exited non-zero
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-10-22 14:32:32 +02:00
Nico Schottelius
b724881c6a remove superfluous = from title to allow building when xsltproc is strict
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2014-10-17 12:46:49 +09:00
Steven Armstrong
9f83622d38 remove legacy/unused explorer
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-10-07 16:36:01 +02:00
Ricardo Catalinas Jiménez
967652b5fe Make __package_{update_index,upgrade_all} quieter
And more non-interactive for the APT case.
2014-10-05 16:00:10 +01:00
Ricardo Catalinas Jiménez
5cfe569369 Make __package_apt even more non-interactive 2014-10-05 15:59:27 +01:00
Nico Schottelius
a6c37d688b Merge branch 'bugfix_type__package_emerge' of https://github.com/dheule/cdist 2014-10-02 15:20:08 +02:00
Ricardo Catalinas Jiménez
81bd4c3338 Add types __package_{update_index,upgrade_all} 2014-09-29 23:53:29 +01:00
Ricardo Catalinas Jiménez
ff880b4287 Fix comment 2014-09-29 22:37:50 +01:00
Ricardo Catalinas Jiménez
fd6b90a736 Cosmetic 2014-09-29 22:37:50 +01:00
Nico Schottelius
58ab351da3 Merge remote-tracking branch 'jake/__pkgng' 2014-09-29 21:18:31 +02:00
Nico Schottelius
7fab50a82b Merge remote-tracking branch 'steven/issue/365' 2014-09-29 20:48:45 +02:00
Daniel Heule
c70834eaff implemented some sugestions from nico 2014-09-29 17:28:45 +02:00
Steven Armstrong
41782cb107 workaround special case where the desired key was already present more then once in target file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-29 14:47:25 +02:00
Nico Schottelius
8a56883d83 Merge branch 'osx-explorers' of https://github.com/mhutter/cdist 2014-09-29 11:14:33 +02:00
Steven Armstrong
4c52b10f93 maybe better define variable _before_ using it
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-29 10:57:27 +02:00
Steven Armstrong
4125dfaab0 them files should end in newline stupid
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-29 10:46:00 +02:00
Steven Armstrong
b17a1f0edb removing and adding keys must be atomic
If we delegate this to multiple seprarate objects (e.g. using __line) and the
config run is interrupted after applying only some of them we may leave the
target in some random state.
We may have even locked ourself out of the target.

So remove and add keys ourself so either none are all changes are
applied.

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-27 11:40:06 +02:00
Steven Armstrong
eed058426a fix that stupid stdin is truncated bug again
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-25 16:35:19 +02:00
Steven Armstrong
68586a0c3d new type to manage a single ssh authorized_key entry
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-25 16:23:38 +02:00
Steven Armstrong
ffd2935cc4 complete rewrite
- add support for authorized_keys options see sshd(8)
- add support for explicit comment after key
- do not allow a key to exist more then once in an authorized_keys file
- remove all conflicting keys

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-25 16:16:15 +02:00
Steven Armstrong
5a895480b7 Merge remote-tracking branch 'telmich/master' 2014-09-24 15:18:40 +02:00
Ricardo Catalinas Jiménez
60b2bbf4c9 Fix messaging variables not exported in type manifest 2014-09-21 11:52:38 +01:00
Jake Guffey
6eff4bb898 Implemented telmich's suggestions
Using $($__explorer/os), command -v directly
Fix spacing
Fix copyright year
2014-09-17 17:43:29 -04:00
Ricardo Catalinas Jiménez
3223a38889 Fix typo in cdistmarker doc 2014-09-13 23:31:38 +01:00
Jake Guffey
37a8b4af2b Minor fixes
Fixed pkgng_exists explorer (can't reference $__global)
Fixed logic in __package/pkgng_freebsd/gencode-remote
   Wasn't installing package if it already exists, but after explorer execution
2014-09-10 15:54:13 -04:00
Jake Guffey
e87b26f2de Introduce __package_pkgng_freebsd type
Create __package_pkgng_freebsd type to handle package management via pkg-ng
Add requirement generation in __package/manifest
Add explorer inside __package to find if pkg-ng is installed on the target
2014-09-09 17:10:32 -04:00
Steven Armstrong
a956583169 Merge remote-tracking branch 'telmich/master' 2014-08-20 13:03:35 +02:00
Nico Schottelius
249455f347 also support archlinux in __locale
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-08-17 12:03:46 +02:00
Steven Armstrong
3dbe375837 no need to double escape a trailing $; $ by itself is not special in any way
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-07-28 15:05:45 +02:00
Steven Armstrong
fff5e48266 /index/match/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-07-28 15:04:48 +02:00
Nico Schottelius
c6ad2e60b3 remove obsolete todos ... people believe they still need to be fixed!
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-26 17:11:35 +02:00
Nico Schottelius
37451590b1 add reset to iptables init.d script
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-26 15:24:42 +02:00
Daniel Heule
614c73e10e correct date of c 2014-06-25 00:18:41 +02:00
Daniel Heule
ab6502c9df correct match if / is the last char of a url and the end of the line 2014-06-25 00:16:40 +02:00
Manuel Hutter
981f8068d2 code diet on "memory" 2014-06-21 14:24:10 +02:00
Manuel Hutter
e727824964 cat and pipe diet 2014-06-18 10:19:21 +02:00
Manuel Hutter
c36fba4b99 Fixed global explorers on OSX 2014-06-17 19:04:22 +02:00
Nico Schottelius
d294a2c28e +"
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-16 08:02:41 +02:00
Nico Schottelius
6a2f2352be new type: __ssh_dot_ssh
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-16 07:57:10 +02:00
Nico Schottelius
efb2c4a163 Merge branch 'fix-file-stat-osx' of https://github.com/mhutter/cdist 2014-06-11 00:35:01 +02:00
Nico Schottelius
3592a0c6dd +suse support in __locale and __hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-10 23:50:53 +02:00
Nico Schottelius
17504975a6 suse support for __timezone
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-10 23:15:21 +02:00
Manuel Hutter
8a70343e2c Fixed wrong mode format for stat on OSX. 2014-06-10 19:48:02 +02:00
Manuel Hutter
90acfc3952 Fixed stat on OSX 2014-06-10 19:19:26 +02:00
Daniel Heule
9bac6da6c9 bugfix emerge type for slotted packages 2014-06-09 15:42:17 +02:00
Nico Schottelius
bbd451433f add --url support for __package_yum
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-05-20 07:43:11 +02:00
Nico Schottelius
c363fc24de begin to make OBJECT_MARKER dynamic
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-05-06 00:28:18 +02:00
Nico Schottelius
ae53b8e381 Merge branch 'bugfix__zypper' of https://github.com/dheule/cdist 2014-05-05 22:32:54 +02:00
Nico Schottelius
47ba46400c Merge pull request #325 from jdguffey/__jail_messaging
Added messaging support for __jail type
2014-05-04 08:52:48 +02:00
Nico Schottelius
1bb897f9a2 Merge pull request #312 from asteven/issue/312
all files cdist creates should allways end with newline
2014-05-04 08:50:30 +02:00
Nico Schottelius
1bfa281cec Merge pull request #334 from dheule/bugfix__explorer_interfaces
bugfix the list of interfaces
2014-05-04 08:43:12 +02:00
Nico Schottelius
bfbc621010 ++releasedate
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-04-29 18:10:50 +02:00
Daniel Heule
3710557c62 bugfix the list of interfaces 2014-04-29 12:57:46 +02:00
Daniel Heule
5a647ec763 Bugfix to auto import pgp keys for new repos, so we can add repos with new keys 2014-04-29 11:49:43 +02:00
Nico Schottelius
9127e06109 CentOS support for __hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-04-25 01:48:58 +02:00
Steven Armstrong
8a4cc56266 ensure all files we create end with a single newline
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-04-22 11:04:02 +02:00
Nico Schottelius
f9783f5f77 Merge branch 'bugfix_issue_327' of https://github.com/dheule/cdist 2014-04-15 01:27:50 +02:00
Daniel Heule
c5152b75f2 rename parameter service_uri to uri as requested 2014-04-14 19:18:16 +02:00
Daniel Heule
831acd16c6 rename parameter repo_uri to uri as requested by nico 2014-04-14 19:14:29 +02:00
Steven Armstrong
40e517f50c new type __yum_repo to manage yum repositories
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-04-14 12:46:17 +02:00
Nico Schottelius
c818442ef2 also linke "files" subdir
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-04-12 19:40:41 +02:00
Jake Guffey
f7a6377b74 Updated man page
Included MESSAGES section
2014-04-07 09:44:28 -04:00
Jake Guffey
d12daf10c4 Added messaging support for __jail type
prints start/stop/create/delete/onboot to $__messages_out
2014-04-07 09:41:03 -04:00
Nico Schottelius
9eec4e22fb Merge branch 'bugfix_type__key_value' of https://github.com/dheule/cdist 2014-04-06 20:22:23 +02:00
Nico Schottelius
ad7977e51b ++;;
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 23:58:58 +02:00
Nico Schottelius
2955ef4344 cleanups
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 21:22:29 +02:00
Nico Schottelius
b7f8b5e339 catch unsupported state cases in __dog_vdi und __qemu_img
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 21:22:15 +02:00
Nico Schottelius
b22b581b67 first version of __dog_vdi
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 14:26:14 +02:00
Nico Schottelius
ff8f7ac287 add copied version __dog_vdi from __qemu_img
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-30 13:09:38 +02:00
Daniel Heule
50316902e3 renamed ll to lastline, hope its now clear what the var is for .. 2014-03-26 13:58:29 +01:00
Nico Schottelius
f3c3f454d3 Merge branch 'feature_new_explorers' of https://github.com/dheule/cdist 2014-03-26 13:06:33 +01:00
Daniel Heule
7b6102750e as requested, replace space with _ 2014-03-26 11:57:15 +01:00
Nico Schottelius
2c6e3e0e96 Merge branch 'jailfix' of https://github.com/jdguffey/cdist 2014-03-26 11:19:09 +01:00
Nico Schottelius
73b54aab09 Merge branch 'issue/321' of https://github.com/asteven/cdist 2014-03-26 11:15:36 +01:00
Nico Schottelius
58d57bc532 Merge branch 'enhancement-package-pkg-openbsd' of https://github.com/ghettosh/cdist 2014-03-26 11:06:22 +01:00
Nico Schottelius
6e81bbc54b Merge branch 'issue/315' of https://github.com/asteven/cdist 2014-03-26 10:59:50 +01:00
Daniel Heule
bae472eb33 fixed some typos in the man page 2014-03-26 10:41:00 +01:00
Jake Guffey
c31278bcd0 Fix __jail explorers
Only fixed gencode*, manifest in PR #279, fixed explorers here
2014-03-25 12:50:27 -04:00
Daniel Heule
b7fb973fa5 bugfix for whitespace stripping, its no more simple 2014-03-21 09:35:47 +01:00
Daniel Heule
807e2902ea Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value
New functionality for remote __object is needed
2014-03-21 09:23:44 +01:00
Daniel Heule
f36dc11601 forgot myself to the headers .. 2014-03-20 17:22:07 +01:00
Daniel Heule
5ef27191fc implementing the $__object and $__object_id on the local and remote
execution call, to allow read access to parameter files
2014-03-20 13:52:12 +01:00
Nico Schottelius
2b03ccd776 changes for 3.1.0
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-19 18:57:11 +01:00
Nico Schottelius
bcca8a637b Merge branch 'master' into type__rbenv 2014-03-13 10:30:48 +01:00
Daniel Heule
619076bd2d corrected a small relict in example 2014-03-12 20:16:33 +01:00
Daniel Heule
a94de8fae4 Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value
Conflicts:
	cdist/conf/type/__key_value/gencode-remote
2014-03-12 20:07:27 +01:00
Steven Armstrong
5ec617fa3e ignore trailing slashes for comparison of source
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 22:16:08 +01:00
Steven Armstrong
301b4e18ff either to it all, or fail; echo and cat suck, printf ftw!
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 21:07:20 +01:00
Daniel Heule
38c3d551ba bugfix, if file was absent and type is now tested on openwrt 2014-03-11 21:05:31 +01:00
Steven Armstrong
75c203a1f0 handle existing symlink but wrong source
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 20:48:47 +01:00
Nico Schottelius
0a98abbffa add messaging support for __key_value
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-11 15:39:08 +01:00
og
3d5706d3cc escaped some variables in the gencode-remote output 2014-03-08 17:18:19 -07:00
og
074938c697 . 2014-03-03 15:13:57 -07:00
og
3fffb93150 OpenBSD pkg utils does not return properly, so we have to verify success by looking at the list of installed packages after the present/absent actions 2014-03-03 14:59:50 -07:00
Nico Schottelius
f06ff4bc3a Merge branch 'master' of https://github.com/ghettosh/cdist 2014-03-03 07:40:54 +01:00
og
ef1f9bf633 updated documentation to reflect new parameter 2014-03-02 17:44:22 -07:00
og
6a455be63a openbsd and freebsd both use the 'passwd' database 2014-03-02 17:34:36 -07:00
og
5cbdf981c0 adding pkg_path parameter to be explicitly set, this is important for using -current, as os_version always parses to a release version (e.g. 5.5) but the path that mirrors have is /snapshots/ 2014-03-02 17:32:14 -07:00
og
1c0d74f7db openbsd stat works the same way that freebsd's does 2014-03-02 17:18:25 -07:00
Daniel Heule
fa55cd7d3b ups, typo ... thx to steven 2014-02-27 21:08:45 +01:00
Daniel Heule
727c918f67 work around a bug in bash3, now tested with dash, bash, busybox 2014-02-27 17:04:23 +01:00
Daniel Heule
0198b99eb5 corrected some debug codesnips 2014-02-27 15:47:19 +01:00
Daniel Heule
8d80e52de9 implemented some suggestions from steven 2014-02-27 14:45:19 +01:00
Daniel Heule
d1c55a9acb Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value 2014-02-25 11:41:18 +01:00
Daniel Heule
225752bd42 updated the man page .... 2014-02-25 11:35:14 +01:00
Nico Schottelius
8e68da055c Merge branch 'docfix-ssh-22' of https://github.com/acatton/cdist 2014-02-25 09:51:43 +01:00
Daniel Heule
820ed5ae0c added option comment_line to prefix key value with a comment line 2014-02-24 23:27:42 +01:00
Daniel Heule
205e256ef6 rewrite of __key_value, now support nerarly every value 2014-02-24 21:42:45 +01:00
Nico Schottelius
a126bd955f use while read -> avoids ifs problem
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-24 18:06:15 +01:00
Nico Schottelius
ce0f779664 include the owner into the object_id for line
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-24 16:00:12 +01:00
Antoine Catton
4e535b6b8b Docfix: ssh service listen on port 22 2014-02-23 20:22:06 -07:00
Steven Armstrong
95f38d9d44 remove no longer supported parameter --comment
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 01:12:41 +01:00
Steven Armstrong
16a829d3eb manage individual keys instead of block of text
also fixes #251

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 01:10:44 +01:00
Steven Armstrong
2fdff153d6 dont fail if result is empty file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 00:57:00 +01:00
Steven Armstrong
68c1bf6633 preserve ownership and permissions of existing file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 00:56:54 +01:00
Nico Schottelius
13e8e53941 Merge branch 'master' into type__rbenv 2014-02-14 20:51:29 +01:00
Nico Schottelius
f461a5073c pass owner/group/mode to __directory as well
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:44:51 +01:00
Nico Schottelius
95b1ac0706 update rbenv type to cdist 3.0 style
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:34:24 +01:00
Nico Schottelius
490bad7b26 Merge branch 'master' into type__rbenv 2014-02-14 20:13:18 +01:00
Nico Schottelius
ab8ae75837 Merge branch 'issue/297' of git://github.com/asteven/cdist 2014-02-14 01:48:03 +01:00
Steven Armstrong
f82a6224f2 use positional arguments in favour of keyword arguments for backwards compatibility with older python
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-13 21:05:37 +01:00
Steven Armstrong
46459053f4 use posix -L in favour of longopts
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-13 21:02:18 +01:00
Daniel Heule
e8f5d4c340 some new explorers wich are handy if you must tune for example sap or
oracle to the systemtype, cpu cores and/or physical memory
2014-02-13 15:38:35 +01:00
Nico Schottelius
a2c2cc139a adjust default branch hint
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-13 10:33:24 +01:00
Nico Schottelius
2ceced593b Merge branch 'bugfix_state_params' of git://github.com/dheule/cdist 2014-02-12 17:04:30 +01:00
Nico Schottelius
01a3f7c0b7 Merge branch 'bugfix_override_and_order' of https://github.com/dheule/cdist 2014-02-12 16:56:30 +01:00
Nico Schottelius
23f85118f5 add a hint about unsupported os
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-12 16:42:02 +01:00
Daniel Heule
cfbc68aa11 bugfix if both override and order is specified 2014-02-12 10:31:46 +01:00
Nico Schottelius
4031209f7b Merge branch 'bugfix_issue_102' of git://github.com/dheule/cdist 2014-02-11 22:30:24 +01:00
Daniel Heule
6a5f908269 yep, dryrun option has now a unittest, was hard to work out ... 2014-02-11 21:17:19 +01:00
Nico Schottelius
dae43b4489 Merge branch 'feature_unittest_CDIST_ORDER_DEPENDENCY' of https://github.com/dheule/cdist 2014-02-11 15:31:56 +01:00
Daniel Heule
e29255b9f2 add an unittest for CDIST_ORDER_DEPENDENCY 2014-02-11 15:20:26 +01:00
Daniel Heule
a5426ff4b5 completed copyright infos ... 2014-02-09 17:43:31 +01:00
Daniel Heule
2dd2f5593f bugfixes for issue 161 and FIXME: also check that there is no object ID
when type is singleton?
2014-02-09 17:10:43 +01:00
Daniel Heule
f3172fda95 2 more types for issue 131 2014-02-08 22:06:27 +01:00
Daniel Heule
423001b702 Make state parameter optional for all types, fixes #131 2014-02-08 21:48:51 +01:00
Daniel Heule
60c53e213c testcases emulator.OverrideTestCase, with some minor bugfixes to make
test work as expected ...
2014-02-07 14:24:12 +01:00
Daniel Heule
f163b32720 first try of a test 2014-02-07 13:28:22 +01:00
Daniel Heule
717e21da6c initial update for override unittests 2014-02-07 00:28:02 +01:00
Nico Schottelius
1be3ea4362 Merge branch 'origin/feature_object_override' of git://github.com/dheule/cdist 2014-02-06 16:32:29 +01:00
Daniel Heule
52e2017d8f CDIST_ALLOW_OVERRIDE -> CDIST_OVERRIDE as requested by nico 2014-02-06 16:03:07 +01:00
Nico Schottelius
41266a1946 Merge branch 'feature__cdist_autodep_try2' of git://github.com/dheule/cdist 2014-02-06 15:48:45 +01:00
Daniel Heule
51afca5336 Implement lastest suggestions from nico, rename ENV Variable to
CDIST_ORDER_DEPENDENCY
2014-02-06 15:26:17 +01:00
Daniel Heule
2b5929c881 Merge branch 'master' of https://github.com/telmich/cdist into feature__cdist_autodep_try2
Conflicts:
	docs/man/man7/cdist-manifest.text
2014-02-06 15:10:34 +01:00
Nico Schottelius
4264237bfe Merge branch 'bugfix__types_default_values' of git://github.com/dheule/cdist 2014-02-06 11:26:35 +01:00
Nico Schottelius
294285c164 import __ccollect_source type
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-06 00:08:40 +01:00
Nico Schottelius
8afb752908 Merge branch 'issue/283' of git://github.com/asteven/cdist 2014-02-05 23:13:59 +01:00
Steven Armstrong
6f0459f3c5 remove legacy FIXME
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-05 21:18:47 +01:00
Steven Armstrong
7686a5ac5e be nice to them users
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-05 21:17:15 +01:00
Steven Armstrong
14a112fcce /wget/curl/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-05 21:12:22 +01:00
Nico Schottelius
34f2f7f038 setting up CDIST_ALLOW_OVERRIDE to any value is ok - do not depend on true/yes/ja
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-05 21:09:24 +01:00
Steven Armstrong
f928072f74 let the user decide what is sane and what not
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-05 21:07:33 +01:00
Steven Armstrong
03ce5a2828 import __apt_* types from private repo
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-04 12:24:10 +01:00
Daniel Heule
3c52710763 little changes for using default parameters correctly 2014-02-03 21:43:39 +01:00
Steven Armstrong
3a57367e7e bugfix: make type actually work with --state absent
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-01 22:46:36 +01:00
Nico Schottelius
a9dd040164 Merge branch 'feature_object_override' of git://github.com/dheule/cdist 2014-01-31 21:47:23 +01:00
Daniel Heule
5fbac8d0ba forgot the : after the else ... 2014-01-31 17:59:56 +01:00
Daniel Heule
197fabf40a added some ideas from asteven and a bit more description about the order
in the manpage
2014-01-31 17:56:55 +01:00
Nico Schottelius
228ed4dbd2 fix typos in __debconf_set_selections
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-29 23:19:07 +01:00
Nico Schottelius
16d51b3cf1 backport ignoring install types in config mode from install_integration branch
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-29 22:40:59 +01:00
Nico Schottelius
c3508945ca Merge branch 'jailfix' of https://github.com/jdguffey/cdist 2014-01-27 19:37:23 +01:00
Jake Guffey
723be34bca Fixed typo
Was assigning jaildir=$object/parameter/name, fixed to $object/parameter/jaildir
2014-01-27 13:22:03 -05:00
Daniel Heule
4ef55ef13f allow object overrides with CDIST_ALLOW_OVERRIDE=true 2014-01-27 16:19:01 +01:00
Nico Schottelius
9049a1421c support --file - in __debconf_set_selections
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-27 14:17:51 +01:00
Nico Schottelius
d0ef6b6583 Merge branch 'issue/271' of git://github.com/asteven/cdist 2014-01-22 22:05:55 +01:00
Steven Armstrong
7a0b3cd7b7 python-software-properties still needed for older ubuntu versions
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-22 21:21:34 +01:00
Daniel Heule
b75481a4d4 parameter default handling in __key_value type corrected 2014-01-21 23:18:10 +01:00
Daniel Heule
360b42e892 parameter default handling in __zypper_repo type corrected 2014-01-21 22:57:06 +01:00
Daniel Heule
08b8270739 parameter default handling in __zypper_service type corrected 2014-01-21 22:45:35 +01:00
Daniel Heule
02c3fe4988 parameter default handling in __qemu_img type corrected 2014-01-21 22:33:10 +01:00
Daniel Heule
92e67182a6 parameter default handling in __cdist type corrected 2014-01-21 22:24:35 +01:00
Nico Schottelius
51c9662475 DO NOT USE ECHO WHEN SOMETHING MAY CONTAIN A B-A-C-K-S-L-A-S-H
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-21 16:41:34 +01:00
Daniel Heule
64f4cff3cb Shell selection support via ENV
CDIST_LOCAL_SHELL for local scripts
CDIST_REMOTE_SHELL for remote scripts
2014-01-20 20:30:37 +01:00
Nico Schottelius
b6bae508a8 use hostnamectl, if available, else use /etc/hostname and hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:26:22 +01:00
Nico Schottelius
8d5357107b use uname -n in hostname explorer
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:07:31 +01:00
Steven Armstrong
aee97cffd6 install proper packages
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-20 14:01:29 +01:00
Nico Schottelius
cd6abf379a allow hostname -f to fail and return empty output
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:52:49 +01:00
Nico Schottelius
9123940255 port selection of first part into gencode-remote
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:51:48 +01:00
Nico Schottelius
29d4f910bc do not change parameters
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:50:42 +01:00
Nico Schottelius
5279b7239c import __hostname - Thanks, Steven!
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:47:45 +01:00
Nico Schottelius
ac0c88fe9f remove some old typos and omit type details that follow anyway
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:28:45 +01:00
Nico Schottelius
ce73cef457 explain that a requirement caused the error, otherwise you search until you die
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:22:48 +01:00
Daniel Heule
61aec12ba1 Try2 to make cdist honor the manifest order,
this implementation has some more lines of code,
but no collision with the require variable.
2014-01-18 19:23:21 +01:00
Nico Schottelius
b0ebc277d6 Merge branch 'issue/260' of git://github.com/asteven/cdist 2014-01-18 15:57:02 +01:00
Nico Schottelius
63af60a0d9 Merge branch 'issue/261' of git://github.com/asteven/cdist 2014-01-18 15:54:38 +01:00
Daniel Heule
824381e6ca new special value require="CDIST_HONOR_MANIFEST_ORDER"
which tells cdist to execute types in the manifest order
2014-01-17 23:35:02 +01:00
Daniel Heule
4e94713f07 documented all messages which I have found via grep 2014-01-17 10:27:21 +01:00
Steven Armstrong
36a330eb3c redirect stderr to /dev/null
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-16 12:00:24 +01:00
Steven Armstrong
0b7d9babf6 whitespace--
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-16 11:11:00 +01:00
Steven Armstrong
3b072a7abb use __block type to manage keys
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-16 11:10:14 +01:00
Steven Armstrong
095c5335c6 use default parameters
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-16 11:05:29 +01:00
Nico Schottelius
2c30704ba7 add hints about ignored parameters
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-15 13:28:41 +01:00
Nico Schottelius
f336bcb6fc Merge branch 'feature/__mount' of git://github.com/asteven/cdist 2014-01-15 13:24:31 +01:00
Steven Armstrong
a787d2b27b new type to manage a block of text in a file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-14 21:43:50 +01:00
Steven Armstrong
33c8f83fa6 new type to manage mounts, either via fstab or manually
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-14 21:39:24 +01:00
Daniel Heule
5a114cf6ae __cron should replace entrys with his id, try 2 2014-01-14 10:11:33 +01:00
Daniel Heule
6afc4b82c2 __cron should replace entrys with his id 2014-01-14 09:47:54 +01:00
Steven Armstrong
94aa0df747 add missing import
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-13 22:09:07 +01:00
Steven Armstrong
ef1394f4d1 filter out special/hidden files when iterating over explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-13 22:07:05 +01:00
Nico Schottelius
d8f39f3903 Merge branch 'bugfix__directory' of https://github.com/dheule/cdist 2014-01-10 11:25:56 +01:00
Nico Schottelius
c130bdf534 if hostname is an absolute path, strip alway leading slash
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-10 00:41:17 +01:00
Daniel Heule
613d66b7a7 corrected man page and gencode update for correct messages 2014-01-09 16:09:49 +01:00
Steven Armstrong
547c1f9c86 copy files instead of directories to give --remote-copy implementation a chance to dereference symlinks
also fixes #242 by filtering 'hidden' files (starting with a dot)

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-08 23:53:08 +01:00
Nico Schottelius
fccdcd768d Merge branch 'bugfix__directory' of https://github.com/dheule/cdist 2014-01-08 14:50:09 +01:00
Daniel Heule
afb06b729e mode and message handling now like __file type 2014-01-08 13:10:46 +01:00
Nico Schottelius
3f08565e59 Revert "install rubygems for ubuntu/debian"
On request by Steven.

This reverts commit d2c45717f1.
2014-01-08 11:09:01 +01:00
Daniel Heule
3e398b233b fix compare with leading 0 on directory mode 2014-01-08 09:48:04 +01:00
Nico Schottelius
f8c36c080e do not escape \ in --line
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-07 22:30:59 +01:00
Nico Schottelius
386a84eafc Merge branch 'bugfix__start_on_boot' of https://github.com/dheule/cdist 2014-01-07 17:47:15 +01:00
Daniel Heule
f5cee7a57d suses chkconfig has the same name, but works different 2014-01-07 17:31:45 +01:00
Steven Armstrong
d2c45717f1 install rubygems for ubuntu/debian
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-07 16:31:32 +01:00
Daniel Heule
dc8e9c6855 fix typo on optional parameter which is only a passthrough to
__package_zypper
2014-01-07 13:23:39 +01:00
Steven Armstrong
7ab5cd35ac missing parens -> matched what we did not want to match
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-21 22:49:06 +01:00
Steven Armstrong
49bdd83ea1 test for feature instead of type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-21 22:00:57 +01:00
Steven Armstrong
08762330e1 default to None, not empty list
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-21 21:59:47 +01:00
Nico Schottelius
fcbb27a648 Merge remote-tracking branch 'steven/issue/240' 2013-12-20 21:24:08 +01:00
Nico Schottelius
b34eadece2 Merge remote-tracking branch 'steven/issue/239' 2013-12-20 20:50:45 +01:00
Steven Armstrong
39f65d2ef7 leave conversion of list to underlying fsproperty
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-20 11:17:43 +01:00
Steven Armstrong
8b0eb5766a bugfix: handle non-existent default
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-20 10:56:46 +01:00
Nico Schottelius
ee25229a48 Merge remote-tracking branch 'dheule/bugfix_zypper_types_on_older_suse_relases' 2013-12-20 08:55:42 +01:00
Nico Schottelius
d288acbe30 Merge remote-tracking branch 'steven/issue/236'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__user/gencode-remote
2013-12-20 08:53:01 +01:00
Nico Schottelius
4353cff72e Merge remote-tracking branch 'steven/issue/239' 2013-12-20 08:50:00 +01:00
Nico Schottelius
7fad1074b6 Merge remote-tracking branch 'dheule/type__user' 2013-12-20 08:45:37 +01:00
Steven Armstrong
67f61eb7ec make default values for optional_multiple parameters work
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-19 23:33:43 +01:00
Nico Schottelius
1d0233fe4e Merge branch 'type__cron' of https://github.com/dheule/cdist 2013-12-19 15:00:16 +01:00
Daniel Heule
c50925cab5 bugfix in __cron type, was a wrong quoting 2013-12-19 14:45:55 +01:00
Daniel Heule
d6f84d1ef0 __start_on_boot incl. gentoo support 2013-12-19 13:54:16 +01:00
Steven Armstrong
80fffbad11 implement messaging for __user type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-19 11:21:44 +01:00
Steven Armstrong
9d54eb7257 implement messaging for __group type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-19 11:21:26 +01:00
Daniel Heule
e5253e0330 correct man page text of system parameter 2013-12-19 08:14:29 +01:00
Nico Schottelius
122fb96654 use default parameter for __start_on_boot type
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-18 18:09:57 +01:00
Daniel Heule
7d4c11a186 reset false mode changes 2013-12-17 14:15:41 +01:00
Daniel Heule
138d26e398 extended type __user: parameter state, system, remove-home new 2013-12-17 14:13:20 +01:00
Daniel Heule
a70d478f9e fixed a minor type with param remove-all-other-services 2013-12-16 17:07:49 +01:00
Daniel Heule
aec1632627 on older systems, zypper service and zypper repos
doesn't know the parameter -E,
so we need a way which works on older releases too
2013-12-16 16:19:27 +01:00
Steven Armstrong
14dee79a9b handle parameter --state explicilty to respect defaults
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-16 13:29:43 +01:00
Nico Schottelius
8854bc55d9 Merge branch 'type__package_emerge_dependencies' of https://github.com/dheule/cdist 2013-12-13 14:31:28 +01:00
Nico Schottelius
bdb4ffb449 Merge branch 'type__package_emerge' of https://github.com/dheule/cdist 2013-12-13 14:30:20 +01:00
Nico Schottelius
8e1cf76cd5 Merge branch 'type__package_zypper' of https://github.com/dheule/cdist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__package_zypper/man.text
2013-12-13 09:00:09 +01:00
Daniel Heule
c48f31389f initial submit of type __package_emerge_dependencies 2013-12-12 10:59:45 +01:00
Daniel Heule
fc8543eab6 initial submit of __package_emerge type 2013-12-12 10:56:15 +01:00
Daniel Heule
b12bd82fe2 corrected some minor spell misstakes 2013-12-12 09:29:22 +01:00
Daniel Heule
aaa142d76b __package_zypper can now handle the version parameter 2013-12-11 17:11:22 +01:00
Nico Schottelius
4bb8dc2f53 2012 -> 2013
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-11 14:43:35 +01:00
Nico Schottelius
f955191d77 Merge remote-tracking branch 'dheule/type__package_zypper' 2013-12-11 14:39:32 +01:00
Daniel Heule
785e54b311 vorbereitung um mit zypper auch spezifische versionen zu unterstützen
parameter ptype auch beim package type zulassen, analog anderer
parameter von subtypes ...
2013-12-11 13:44:01 +01:00
Daniel Heule
01dc23b00c postfix install works also on suse (SLES11) 2013-12-11 13:07:40 +01:00
Daniel Heule
0acf3c0118 type __postfix_postconf is tested and aproved to work on suse (SLES11) 2013-12-10 17:25:03 +01:00
Daniel Heule
e1eae5604e unlock the whole power of zypper
added the ptype parameter (package type of zypper install)
2013-12-10 16:57:02 +01:00
Nico Schottelius
ae438b9719 Merge pull request #220 from dheule/type__zypper_service
new type  __zypper_service
2013-12-10 06:43:38 -08:00
Daniel Heule
f7f63aa7a2 remove SFS from man page text ... 2013-12-10 11:54:42 +01:00
Daniel Heule
0f1dabb080 inital commit of __zypper_service 2013-12-10 11:50:18 +01:00
Steven Armstrong
d068dfd621 escape and thereby preserve quotes in values
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-10 11:02:10 +01:00
Daniel Heule
e6420a49e8 verhindern dass raw and raw_command zusammen angegeben werden 2013-12-09 11:39:44 +01:00
Daniel Heule
02aad6f4cc revert vom chmod der aus versehen geändert wurde ... 2013-12-09 09:57:31 +01:00
Daniel Heule
c0da6fcc89 Verbesserungen am __cron type
1. Filter messages from crontab -l welche das ganze file füllen
2. neuer parameter raw_command, um globale variablen zu setzen ...
2013-12-09 09:44:40 +01:00
Nico Schottelius
fe20da6594 note hint from Axel Beckert for debian prios
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-07 00:13:28 +01:00
Nico Schottelius
a89926c40b Merge branch 'dheule/type__zypper_repo' 2013-12-06 23:53:46 +01:00
Daniel Heule
a271244cfb Die 4 codepaths mit comments erklaert ... 2013-12-06 15:23:09 +01:00
Steven Armstrong
367ef21bd8 make __postfix_* types depend on __postfix
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-06 13:49:45 +01:00
Daniel Heule
59de2afdaa ups, was a variable collision 2013-12-05 13:14:15 +01:00
Daniel Heule
512b410012 korrektur eines typos ... 2013-12-05 08:47:57 +01:00
Daniel Heule
e1a2ebab5c gencode-remote gibt nur noch befehle aus wenn was zu tun ist ... 2013-12-05 08:45:12 +01:00
Nico Schottelius
a5fc3f5002 remove changed attribute of an object - was never used and will never be used
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-04 21:29:56 +01:00
Daniel Heule
72bbf93282 korrekte ids, hier werden von zypper keine quotes erwartet, da nur
zahlen moeglich sind
2013-12-04 15:32:31 +01:00
Daniel Heule
a37c48ed43 bei dem repo_id eine kleine verschoenerung 2013-12-04 15:24:18 +01:00
Daniel Heule
33a4f07bb4 in der manpage state parameter besser erlaeutert ...
TODO: howto line breaks in html ?
2013-12-04 15:22:48 +01:00
Daniel Heule
ea33b093f0 cleanup of variable quoting 2013-12-04 14:58:15 +01:00
Daniel Heule
808ea30634 Korrektur der intention, vim hat mich verschaukelt ... 2013-12-04 14:50:11 +01:00
Nico Schottelius
acd42b259b do not generate code when mode = 0xxx format
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-04 13:37:15 +01:00
Nico Schottelius
ed10f4e5b4 use default parameter
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-04 13:19:25 +01:00
Nico Schottelius
b9dcd01ea1 only restart the firewall (iptables) if needed
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-04 13:19:04 +01:00
Daniel Heule
6a68c14a76 letzter feinschliff bei der man page ... 2013-12-04 10:56:45 +01:00
Daniel Heule
19219fe1f9 An allen orten correcte gpl headers eingesetzt ... 2013-12-04 09:44:45 +01:00
Daniel Heule
b29a52db1a Initial add vom type __zypper_repo 2013-12-04 09:37:01 +01:00
Nico Schottelius
68b7392021 add support for messaging to __file, document messaging in reference
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-03 15:41:43 +01:00
Nico Schottelius
684ad56a80 Merge branch 'master' into notifications
Took the __file parts from master.

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__file/gencode-local
	cdist/conf/type/__file/gencode-remote
2013-12-03 14:38:11 +01:00
Nico Schottelius
90896a9e06 update environment with messages environment
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-03 14:36:38 +01:00
Nico Schottelius
a95167b374 remove quotes from mkdiropt
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-02 15:49:02 +01:00