Nico Schottelius
0dc6af2512
wrap into a class
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 04:22:40 +02:00
Nico Schottelius
e8a6d89e3c
wrap into a class
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 04:22:21 +02:00
Nico Schottelius
572401e4f8
commit broken stuff
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:56:59 +02:00
Nico Schottelius
7a7413f1f4
pause
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:31:58 +02:00
Nico Schottelius
ff2d5629d6
submit string on failed error
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:28:06 +02:00
Nico Schottelius
9036f8c4cc
executing explorers works
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:24:27 +02:00
Nico Schottelius
85df71c9fa
executing explorers works
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:23:18 +02:00
Nico Schottelius
ef925714d5
transfer explorer
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:57:47 +02:00
Nico Schottelius
d0eeafd228
also add some bugs
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:56:02 +02:00
Nico Schottelius
78a5bbf6e8
remove the currently broken init()
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:52:38 +02:00
Nico Schottelius
94fc5b3c91
add remove_remote_dir()
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:51:45 +02:00
Nico Schottelius
6e3c228a6f
transfer_dir() added
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:46:09 +02:00
Nico Schottelius
09c58e2327
exit, if there are no global explorers
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:39:24 +02:00
Nico Schottelius
11750515e1
finish global_explorer_directory()
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:16:13 +02:00
Nico Schottelius
c2873a8fa0
ipmlement base_directory
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:12:48 +02:00
Nico Schottelius
ffd7f4b251
--todo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:48:23 +02:00
Nico Schottelius
89964b32dd
in theory, init_deploy is done
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:41:54 +02:00
Nico Schottelius
a90751dcff
begin to implmenent remote execution
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:36:22 +02:00
Nico Schottelius
9711a5612d
partly implement run_or_fail, init_deploy
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:21:15 +02:00
Nico Schottelius
34bb391937
+header
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:01:25 +02:00
Nico Schottelius
1b84a28511
add cdist
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 00:41:37 +02:00
Nico Schottelius
dc820cf31e
also filter stderr and add hostname as prefix
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-07-28 10:54:39 +02:00
Steven Armstrong
aa6b655cd3
new executable that uses its stdin as the initial manifest
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-07-01 16:02:03 +02:00
Steven Armstrong
dd949d5984
explorers for types with clashing names not pushed to target
...
Thorsten Steenbock reported a bug where types with similar names, e.g
__first
__first_second
would interfere when transfering explorers to the target host.
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-07-01 13:18:18 +02:00
Nico Schottelius
d7ae5c88e6
and EXIT!
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-06-08 21:26:13 +02:00
Nico Schottelius
6f99de75a5
only trap signals in front end scripts
...
Otherwise children execute kill egain and the shell segfaults
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-06-08 21:23:53 +02:00
Nico Schottelius
56cf428d4c
use kill 0 on SIGINT and SIGTERM, but not on trap EXIT
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-06-08 21:19:05 +02:00
Nico Schottelius
c1d17f8d14
no need for execute bit on cdist-config
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-12 17:56:50 +02:00
Nico Schottelius
916d355891
remove kill 0 in cdist-config from master branch until it works :-)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-12 17:08:18 +02:00
Nico Schottelius
14708a9c59
-SIG
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 17:12:02 +02:00
Nico Schottelius
ee076ef7e9
only kill children, if we got signalled
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 17:11:15 +02:00
Nico Schottelius
a202826a62
also kill children in cdist core
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 17:07:52 +02:00
Nico Schottelius
b1f10f2936
use kill 0 to kill all children
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 16:58:59 +02:00
Nico Schottelius
8b4196e023
Prepare release of 1.7.0 (1)
2011-05-10 15:49:35 +02:00
Nico Schottelius
d8cd9e0118
allow debug to be unset when using
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 10:04:37 +02:00
Nico Schottelius
ae538362e6
__cdist prefix in bin/cdist-code-run
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 19:01:21 +02:00
Nico Schottelius
ac157aa442
allow no code in cdist-code-run
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 15:21:35 +02:00
Nico Schottelius
49ebb77ab3
adjust __cdist_object_code cal in cdist-code-run
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 15:16:28 +02:00
Nico Schottelius
5e34bebc05
cleanup in cdist-object-gencode
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 15:07:13 +02:00
Nico Schottelius
bba8c641e5
remove unecessary cd
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 15:00:20 +02:00
Nico Schottelius
fc01ceb914
in theory: do not generate code anymore
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 14:59:57 +02:00
Nico Schottelius
93ef73a645
move gencode type path combination into cdist-config (also for __cdist_type_gencode)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 14:46:35 +02:00
Nico Schottelius
99bf12a48f
move gencode type path combination into cdist-config
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 14:45:14 +02:00
Nico Schottelius
1ff135a9d5
begin to move parts to cdist-object-gencode
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 14:37:33 +02:00
Nico Schottelius
266b608357
always setup e
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-21 12:06:05 +02:00
Nico Schottelius
a16523a72f
begin to add code to kill subprocesses on exit
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-21 12:03:32 +02:00
Nico Schottelius
7d8a58e6d1
and - debug
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-20 13:47:36 +02:00
Nico Schottelius
43526d41a5
remove set -e from bin/cdist-mass-deploy and bogus shift
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-20 13:46:08 +02:00
Nico Schottelius
efe1d3db79
Prepare files for the next release
2011-04-19 22:43:18 +02:00
Nico Schottelius
20f0a788b1
use -gt consistently
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-17 11:32:11 +02:00
Nico Schottelius
91106ba0af
comment for sysadmins
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-17 00:11:23 +02:00
Nico Schottelius
01a541d017
use different count to ignore case of 0 hosts
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-17 00:10:07 +02:00
Nico Schottelius
471b8a7308
pass hostname to filter
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:57:46 +02:00
Nico Schottelius
9c60a81d8a
decrease first, last number is unused
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:57:20 +02:00
Nico Schottelius
0122ccc3ee
in theory finish new error catching + displaying code
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:56:10 +02:00
Nico Schottelius
da1d3fbc04
begin new error catching code and make filter a function
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:51:24 +02:00
Nico Schottelius
231eb1214c
refuse to try to recreate a type
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:33:48 +02:00
Nico Schottelius
10ebdd87d4
fixes + local and remote gencode
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:31:15 +02:00
Nico Schottelius
0e42e98bb9
begin to cleanup bin/cdist-type-template
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:27:01 +02:00
Nico Schottelius
10cc25330c
remove space at the end of the line
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-08 10:57:18 +02:00
Nico Schottelius
4873b046ba
allow user to change __cdist_tmp_base_dir to avoid using /tmp
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-08 10:52:03 +02:00
Nico Schottelius
c3341df08d
Upgrade to 1.6.1
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-07 09:56:59 +02:00
Nico Schottelius
b0391ac0c9
BUGFIX: do not fail, if cache/ is missing
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 22:09:04 +02:00
Nico Schottelius
0a3a434269
remove ... dots ... make ... me ...feel ... weired
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:51:43 +02:00
Nico Schottelius
bc1c7f104e
core prefix
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:50:49 +02:00
Nico Schottelius
31164be1d0
remove full path to manifest in logging (will be presented on error anyway)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:44:41 +02:00
Nico Schottelius
e7ad5987e4
+ self variable
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:43:32 +02:00
Nico Schottelius
315de6fe15
log improvements
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:41:40 +02:00
Nico Schottelius
b86d3ba26a
remove ugly OBJECT messages
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:38:41 +02:00
Nico Schottelius
c0a83f9d85
++__cdist_exit_err
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:22:44 +02:00
Nico Schottelius
49e8efdaf5
object self, not object
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:20:58 +02:00
Nico Schottelius
bb96163315
blame on the right file
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:19:47 +02:00
Nico Schottelius
05c8634f8b
correctly use __cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:19:21 +02:00
Nico Schottelius
fb0dafba5c
make faulty code a warning
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:18:15 +02:00
Nico Schottelius
838d43d74c
do not fail if code is missing, but inform
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:17:11 +02:00
Nico Schottelius
35d4760c13
++__cdist_echo ++todo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:15:11 +02:00
Nico Schottelius
4a7c6c2738
++__cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:12:00 +02:00
Nico Schottelius
afdecb8836
++__cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:10:34 +02:00
Nico Schottelius
0580406ff2
there is no __cdist_object in this context
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:08:40 +02:00
Nico Schottelius
96c4024a51
bugfix + real use of __cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:07:39 +02:00
Nico Schottelius
df58c4e5f5
echo, not info
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:03:37 +02:00
Nico Schottelius
a08bd18f4e
make first real use of new __cdist_echo with __cdist_object_self setup
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:59:57 +02:00
Nico Schottelius
caed694dee
++__cdist_echo + FIXME
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:58:34 +02:00
Nico Schottelius
2162d444b3
better logging in __cdist_exec_fail_on_error
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:55:53 +02:00
Nico Schottelius
1f4e8fe564
do not create code if there is no gencode
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:54:34 +02:00
Nico Schottelius
8924a9583d
++__cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:52:14 +02:00
Nico Schottelius
ec513eae49
++__cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:51:17 +02:00
Nico Schottelius
cb5fc962b3
use __cdist prefix
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:50:09 +02:00
Nico Schottelius
d0434ea56b
1.6.1++
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:46:40 +02:00
Nico Schottelius
d75f2d4d29
++__cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:38:31 +02:00
Nico Schottelius
d000de2be9
code, not gencode
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:36:21 +02:00
Nico Schottelius
f08a9eaaa9
+: after object_self
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:35:27 +02:00
Nico Schottelius
9d5d0b8cdd
always setup __cdist_echo_prefix
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:34:46 +02:00
Nico Schottelius
290915ee64
__cdist_echo++
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:34:07 +02:00
Nico Schottelius
e3f27f1794
allow empty $__cdist_object_self
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:31:19 +02:00
Nico Schottelius
e4390da300
requiring set +e in __cdist_exec_fail_on_error to catch error ourselves
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:18:31 +02:00
Nico Schottelius
d31833a78e
begin use of __cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:16:16 +02:00
Nico Schottelius
813b4e1f2b
use __cdist_exec_fail_on_error in bin/cdist-code-run
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:11:39 +02:00
Nico Schottelius
08d18ec1ec
show broken code
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:05:58 +02:00
Nico Schottelius
90f5d47164
add warning level
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:04:34 +02:00
Nico Schottelius
723046fdd2
introduce and use __cdist_echo
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:00:36 +02:00
Nico Schottelius
4aa0d80310
prepare files for 1.6.0 release
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 19:36:57 +02:00
Nico Schottelius
1973ac0787
use wait instead of fg
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:22:44 +02:00
Nico Schottelius
75509dc8a5
PLUS whitespace (not only, but also for Steven)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:18:14 +02:00
Nico Schottelius
5aa32fa42d
beautify parallel mode
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:16:33 +02:00
Nico Schottelius
b9ef12b48d
enhance cdist-mass-deploy and add parallel execution
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:05:47 +02:00
Nico Schottelius
32c2612934
ge vs lt
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:59:34 +02:00
Nico Schottelius
e84ab9e14c
in theory finish cdist-mass-deploy
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:58:00 +02:00
Nico Schottelius
7496639e1f
add template for cdist-mass-deploy
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:56:16 +02:00
Steven Armstrong
71765210bb
rename cdist-object-process to cdist-object-prepare
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-04-05 22:55:46 +02:00
Nico Schottelius
c5925ff331
prepare version change
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-05 17:43:10 +02:00
Nico Schottelius
c532a2ccd3
remove one Error of Error: Error: /home/users/nico/oeffentlich/rechner/projekte/cdist-used/conf/type/__nico_desktop/manifest exited non-zero.
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 02:22:08 +02:00
Nico Schottelius
a648aa5333
fix cdist-object-all: ensure output directory exists
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 22:25:56 +02:00
Nico Schottelius
7d0877d8ce
++cleanups
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 20:29:22 +02:00
Nico Schottelius
5359ed863c
+cleanups++
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 20:21:08 +02:00
Nico Schottelius
b3d7cf3192
more cleanups, __cdist prefixes
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 19:35:26 +02:00
Nico Schottelius
9955dc74c6
cleanups in bin/
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 18:43:08 +02:00
Nico Schottelius
dd176d7a64
construct cache dir path in cdist-config, not cdist-cache
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 15:40:08 +02:00
Steven Armstrong
e7ff4c37ff
remove legacy commented code
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-31 11:08:10 +02:00
Steven Armstrong
61b7b68671
split explorer/manifest and gencode runcode into to 2 steps
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-30 22:46:49 +02:00
Steven Armstrong
e7f7a88357
prefix error messages with Error:
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 22:00:54 +02:00
Steven Armstrong
1cfdc6886f
fail if a requested object is not defined
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:51:59 +02:00
Steven Armstrong
878f7d18ce
move export of __cdist_out_object_dir to cdist-run-remote
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:49:06 +02:00
Steven Armstrong
fe159eccb2
prefix all variables with __cdist
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:47:05 +02:00
Steven Armstrong
2345d6509b
add missing function call to __cdist_usage
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:20:07 +02:00
Nico Schottelius
1d05756076
release 1.5.0
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:47:02 +02:00
Steven Armstrong
ebbacf4873
remove unused functions
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 16:41:38 +02:00
Nico Schottelius
6be9d02e6a
consistency: function {} begin on next line
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:28:59 +02:00
Nico Schottelius
ad7a9f82f7
__cdist_objects_created == local output
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:27:57 +02:00
Steven Armstrong
f2967ef9f1
remove legacy script
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:36:23 +02:00
Steven Armstrong
ce62775aec
remove hard coded variable names; prefix all variables with __cdist_
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:29:56 +02:00
Steven Armstrong
32392d129a
implement $__self
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:27:17 +02:00
Steven Armstrong
801d2be3d2
remove legacy variables
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:17:45 +02:00
Steven Armstrong
f187ed257a
implement the big code shuffle
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 14:36:35 +02:00
Nico Schottelius
5306737d22
discuss todos / cleanup / make more fun for us
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 10:38:35 +02:00
Nico Schottelius
3618b225a3
make all internal variables __cdist_ prefixed
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 10:34:04 +02:00
Nico Schottelius
c80fa65af1
-blank line
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:42:04 +02:00
Nico Schottelius
a46c0a4372
replace CONSTANT target host by variable target host
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:38:43 +02:00
Nico Schottelius
8315ac2e25
- blank lines
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:38:08 +02:00
Nico Schottelius
8abd5ce33e
- another empty line
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:37:26 +02:00
Nico Schottelius
332548ba4f
more todo, less whiteline in bin/cdist-object-explorer-run
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:31:26 +02:00
Nico Schottelius
78777ba9f3
use same argv processing as elsewhere
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:30:09 +02:00
Nico Schottelius
10c96dee87
-useless emptly line in bin/cdist-deploy-to
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:26:17 +02:00
Nico Schottelius
4e68c3027b
remove self explanatory comments
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:19:51 +02:00
Nico Schottelius
4ab770400a
- lines + variable alignement
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:17:17 +02:00
Nico Schottelius
29b61f38ea
remove unecessary empty lines (interrupts read flow)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:09:35 +02:00
Steven Armstrong
9381b1c233
merge current master
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 17:15:26 +02:00
Steven Armstrong
8b0b7052c6
remove commented obsolete code
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 15:28:55 +02:00
Steven Armstrong
5ce4586fd3
Merge branch 'changerunningorder' into executionorder
2011-03-28 15:27:32 +02:00
Steven Armstrong
db66d3731d
merge master
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 15:27:00 +02:00
Nico Schottelius
62c4f0d086
ABORT if explorer fails, not only WARN
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 15:16:48 +02:00
Nico Schottelius
02a2d39ebf
Merge branch 'master' into changerunningorder
...
Conflicts:
bin/cdist-deploy-to
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 15:02:12 +02:00
Steven Armstrong
4ee5d74c9f
implement dependency handling at the object level
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 14:55:58 +02:00
Steven Armstrong
cd1a1347c9
merge from changerunningorder
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 13:03:17 +02:00
Steven Armstrong
1c51d32cdc
add missing variable __cdist_type
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 12:45:16 +02:00
Steven Armstrong
0f2193c5e3
concentrate on iteration in cdist-object-run-all; move all execution code into new executable bin/cdist-object-run
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 12:44:03 +02:00
Steven Armstrong
b5ab490a23
add more half backed code for new object-run ideas
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 10:02:13 +02:00
Steven Armstrong
4687d32771
add half backed code for new object-run ideas
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 10:00:22 +02:00
Nico Schottelius
d21cfa66a0
+indent
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-27 22:58:42 +02:00
Nico Schottelius
0a14aa080c
prepare version change
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-26 23:04:06 +01:00
Steven Armstrong
bdf3e4b86e
prefix all variables with __cdist_
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 22:09:19 +01:00
Steven Armstrong
4e2d063911
cleanup: remove unused variables
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:53:03 +01:00
Steven Armstrong
2c71018699
migrate to new workflow
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:52:15 +01:00
Steven Armstrong
0dab5b5f7e
extract code to transfer objects into its own executable
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:48:44 +01:00
Steven Armstrong
4c6f115a43
extract code to execute gencode-generated scripts into its own executable
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:48:19 +01:00
Steven Armstrong
31842564d3
extract code to run gencode scripts into its own executable
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:47:51 +01:00
Steven Armstrong
e8d656556c
/__cdist_remote_out_object_base_dir/__cdist_remote_out_object_dir/
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:46:53 +01:00
Steven Armstrong
14ece853df
trust nico when he says: SSH DESTROYS WHILE READ LOOP
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:46:02 +01:00
Steven Armstrong
31a0b6c3d0
fixed inconsistencies between local and remote variable naming
...
- /__cdist_remote_out_object_base_dir/__cdist_remote_out_object_dir/
- __cdist_remote_object_dir += __cdist_name_dot_cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:43:55 +01:00
Steven Armstrong
b740a4b934
use new workflow
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 00:26:12 +01:00
Steven Armstrong
f7d20c002c
introduce new executable to process objects
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 00:25:46 +01:00
Steven Armstrong
92005e2567
extract code to run an objects explorers into its own executable
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 00:24:35 +01:00
Steven Armstrong
086e47a636
extract code to transfer type explorers into its own executable
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 00:23:59 +01:00
Nico Schottelius
a9ce26f968
integrate cdist-cache
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-25 23:35:11 +01:00
Nico Schottelius
8f88ed2691
template for cdist-cache
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-25 23:17:35 +01:00
Steven Armstrong
c7ebbb4125
Merge remote branch 'nico/master' into changerunningorder
2011-03-25 23:08:50 +01:00
Nico Schottelius
3356564c77
upgrade to 1.4.1
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-25 22:24:02 +01:00
Nico Schottelius
17c6a650ff
change workflow proposal
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 15:06:56 +01:00
Nico Schottelius
b20a50899a
only diff parameters ?
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:35:29 +01:00
Nico Schottelius
4d2e03b966
always add source, even if everything went successful...
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:28:50 +01:00
Nico Schottelius
914ec3104e
only append source in final tree, otherwise we always conflict
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:27:05 +01:00
Nico Schottelius
762c0b4935
BUGFIX: marker reset got lost during migration to cdist-type-emulator
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:24:51 +01:00
Nico Schottelius
79eec9bd23
make PATH setting independent of further code
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:17:43 +01:00
Nico Schottelius
7a294bf41d
always setup __cdist_out_object_dir, which needs to be done anyway
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:13:52 +01:00
Nico Schottelius
b44734e70a
local != remote
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 00:27:40 +01:00
Nico Schottelius
1e66bc4380
exchange new and object dir (good idea, steven)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 23:54:13 +01:00
Nico Schottelius
44ecd1f056
i'm tired, doing stuff that's already in the lines
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:27:27 +01:00
Nico Schottelius
a48e5ca8a1
+"
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:25:42 +01:00
Nico Schottelius
f375b5cb91
submit $__cdist_out_object_dir to cdist-code-run on target host
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:24:48 +01:00
Nico Schottelius
5e5334dee1
prepare release 1.4.0
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:24:21 +01:00
Nico Schottelius
c527e1a9c4
cleanup and make cdist-deploy-to run all stages again
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:48:36 +01:00
Nico Schottelius
a40974e286
check for existence and executable in manifest-run-all, because it's correct for manifest-run to fail if something is broken as it's used for init
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:45:00 +01:00
Nico Schottelius
65763a1b4d
search for .cdist not source
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:39:06 +01:00
Nico Schottelius
1dacf779e6
HUGE cleanup of cdist-manifest-run-all
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:33:16 +01:00
Nico Schottelius
d7819b1922
do not use output dir in cdist-manifest-run-init
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:46:24 +01:00
Nico Schottelius
2d00e9d869
remove obsolete output from cdist-manifest-run
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:45:38 +01:00
Nico Schottelius
9ba61ac044
remove debug
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:41:56 +01:00
Nico Schottelius
d7b765e498
base_dir not dir_base
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:38:14 +01:00
Nico Schottelius
1756608720
in theory finish new algorithm to allow same objects
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:33:26 +01:00
Nico Schottelius
92860706b2
import merge code from cdist-manifest-run-all into cdist-type-emulator
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 12:20:09 +01:00
Nico Schottelius
2ef17f9bf2
begin merge section in cdist-type-emulator
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 12:15:00 +01:00
Nico Schottelius
34b5e44091
re-include parameter check
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 12:12:03 +01:00
Nico Schottelius
6e5ed1c8e8
re-include requirement recording
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:56:19 +01:00
Nico Schottelius
d8f7ebc73f
move .dotfiles to .cdist/dotfiles (without dot)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:45:50 +01:00
Nico Schottelius
fa0a3af2a0
correctly record parameter, remove sed (not required)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:44:33 +01:00
Nico Schottelius
b46850cd12
begin to reintegrate parameter recording
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:39:17 +01:00
Nico Schottelius
a6702cc804
do not setup variables in cdist-config
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:32:22 +01:00
Nico Schottelius
69453feaa5
add __cdist_object_source_add
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:30:22 +01:00
Nico Schottelius
ab02adf01a
abort after manifest-run-init to verify new methods
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:27:38 +01:00
Nico Schottelius
6f67911a0b
sort object area in cdist-config
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:19:05 +01:00
Nico Schottelius
359e252ef7
begin to sort cdist-config by alphabet
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:12:39 +01:00
Nico Schottelius
25bf9e4185
Merge branch 'dotcdistapproach' into allowredefobject
2011-03-23 11:05:09 +01:00
Nico Schottelius
117232ce9d
begin rewrite of cdist-type-emulator
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:05:02 +01:00
Nico Schottelius
19e6ea9c80
begin restructure, use name __cdist_object_self for type/object_id combination
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 10:47:13 +01:00
Nico Schottelius
0a028785c3
remove check whether object already exists
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 10:39:45 +01:00
Nico Schottelius
0c593f5c5b
-created in text
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-22 16:48:02 +01:00
Nico Schottelius
e921986e32
remove double slash in __cdist_object in bin/cdist-type-emulator
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-22 08:57:19 +01:00
Nico Schottelius
8a76143e33
shrink cdist env and make it usable for . ./bin/cdist-env (in sh)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-22 08:29:59 +01:00
Nico Schottelius
7f3e22239f
add dot-cdist to cdist-config
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 16:18:04 +01:00
Nico Schottelius
b41c1f7649
upgrade to 1.3.2
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 14:11:24 +01:00
Nico Schottelius
30c2b017d4
also name source of object when running type manifests
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 12:24:42 +01:00
Nico Schottelius
c0e2113643
update files for 1.3.1
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:59:04 +01:00
Nico Schottelius
6f02112aeb
check for correct entry on move, not parameter ;-)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:46:54 +01:00
Nico Schottelius
0f2eeda838
include move of requirements and make move a loop
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:35:25 +01:00
Nico Schottelius
0d39da6a2b
output dependencies to the user
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:31:32 +01:00
Nico Schottelius
be3080b247
__cdist_exit_err, not __exit_err
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 22:42:00 +01:00
Nico Schottelius
69fc63df1e
export __target_user to non-core
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:44:31 +01:00
Nico Schottelius
2830e2e894
-very verbose debug
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:12:35 +01:00
Nico Schottelius
6800bbff10
call new name in requirement block
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:01:23 +01:00
Nico Schottelius
c7ccedd463
DO NOT DO WHILE READ LOOP WITH SSH
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:01:02 +01:00
Nico Schottelius
0d4f2a6c4b
use __cdist_abs_mydir instead of which
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 00:31:34 +01:00
Nico Schottelius
6f480810f3
Update to 1.3.0
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 00:02:44 +01:00
Nico Schottelius
20e4e73bcd
fixup cdist-code-run-all and remove obsolete code
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:17:40 +01:00
Nico Schottelius
418c3db23e
remove almost obsolete bin/cdist-remote-code-run-all
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:15:55 +01:00
Nico Schottelius
1099c55c9a
args==3
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:14:58 +01:00
Nico Schottelius
8b43913366
include local+remote run in bin/cdist-code-run-all
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:14:48 +01:00
Nico Schottelius
1785f5acd0
add local/remote code run capability
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:12:49 +01:00
Nico Schottelius
6f79f01206
cdist-remote-code-run is now also locally used: name it cdist-code-run
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:01:35 +01:00
Nico Schottelius
4368e00c57
save generated code in its own file
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:33:18 +01:00
Nico Schottelius
c086e7fcc1
adjust argument usage in bin/cdist-object-gencode
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:26:00 +01:00
Nico Schottelius
c5590cb648
extend cdist-object-gencode* to include remote/local extension
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:19:44 +01:00
Nico Schottelius
1af34c74b8
begin to differentiate local and remote object code generation
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:15:54 +01:00
Nico Schottelius
88e20abddb
remove obsolete call to $@ in bin/cdist-remote-explorer-run
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 15:11:03 +01:00
Nico Schottelius
8d4d5a5c15
switch to cdist 1.2.0
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 03:05:22 +01:00
Nico Schottelius
7525e82ce4
clearify what to move
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:52:42 +01:00
Nico Schottelius
3d0cdfb7c3
move to correct top dir, not to itself
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:26:52 +01:00
Nico Schottelius
25664d26e9
+new
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:24:22 +01:00
Nico Schottelius
30a3514dfe
create top level hierarchy on mv and move to object to one dir higher
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:23:09 +01:00
Nico Schottelius
5985fafe86
move whole object
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:17:17 +01:00
Nico Schottelius
68adb9453a
make the user aware of the copy process (waiting and nothing happens stinks)
...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-18 10:40:31 +01:00