[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 93363446e45aece7b07bfcd6237b2b5eb658d065

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 93363446e45aece7b07bfcd6237b2b5eb658d065

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2126 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  93363446e45aece7b07bfcd6237b2b5eb658d065 (commit)
       via  1022b203addeabb2dbaa61c5475ea5ec8e89639a (commit)
      from  87487585c0d46532199ffe3deccc04efc3ea8ef4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 93363446e45aece7b07bfcd6237b2b5eb658d065
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Dec 5 14:42:54 2018 +0000

    AWS: Add a timestamp to user-data.log
    
    This way, multiple (failed) runs of the script won't
    overwrite the log file.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 1022b203addeabb2dbaa61c5475ea5ec8e89639a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Dec 5 14:38:28 2018 +0000

    AWS: Write user-data.log to /var/log
    
    This should not be in /root at all.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/helper/aws-setup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index e3f1d0a9f..af6d24c8b 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -107,7 +107,8 @@ import_aws_configuration() {
 			chmod 700 /tmp/aws-user-data.script
 
 			# Run the user-data script
-			/tmp/aws-user-data.script &>/root/user-data.log
+			local now="$(date -u +"%s")"
+			/tmp/aws-user-data.script &>/var/log/user-data.log.${now}
 
 			# Delete the script right away
 			rm /tmp/aws-user-data.script


hooks/post-receive
--
IPFire 2.x development tree