Changes between Version 95 and Version 96 of SystemAdministration/Default_VM_setup

Timestamp:

08/15/18 20:34:55 (6 years ago)

Author:

André Moreira

Comment:

--

SystemAdministration/Default_VM_setup

@@ -96 +96 @@
 systemctl start docker.service
 }}}
-### "deploy" and "setup" users' configuration ###
+### "deploy" and "setup" users' configuration -> needs manual copy of private deploy key for gitlab/github in <1> ###
 
 {{{
@@ -118 +118 @@
 ## Configure 'setup' user gitlab access
 mkdir -p /home/setup/.ssh
-## Add the private part of the deploy key to /home/setup/.ssh/id_rsa_gitlab_deploy
 sudo tee '/home/setup/.ssh/config' <<'EOF'
 #Deploys
@@ -127 +126 @@
 EOF
 
+## <1> <Manually copy the private deploy key to /home/setup/.ssh/id_rsa_gitlab_deploy>
+
+chown -R setup:setup /home/setup/.ssh
+chmod go+rx /home/deploy
+
 ## Add sudo rights to deploy and setup users
 echo 'Cmnd_Alias GIT_TAGSONLY_COMMANDS = /bin/git init *, /bin/git remote add origin *, /bin/git reflog expire --expire=all --all, /bin/git tag -l, /bin/git tag -d *, /bin/git fetch origin --depth\=1 +refs/tags/*\:refs/tags/*, /bin/git reset --hard tags/*, /bin/git ls-remote --tags *, /bin/git describe --tags, /bin/git gc --prune=all, /bin/git add ., /bin/git commit -m *, /bin/git rev-parse --abbrev-ref HEAD, /bin/git branch *, /bin/git branch -D *.backup*, /bin/git checkout *, /bin/git status, /bin/git status *, /bin/git diff, /bin/git diff *'  | sudo EDITOR='tee -a' visudo
@@ -144 +148 @@
  
 ## Setup the deploy.sh script on the 'deploy' user home
-(su deploy
-cd ~
+sudo -u deploy bash -i -c "
+(cd ~
 mkdir deploy-assets
 cd deploy-assets
@@ -155 +159 @@
 git gc --prune=all
 cd ../..
-ln -s deploy-assets/deploy-script/deploy.sh deploy.sh
-exit)
-}}}
-### Postfix configuration for host email (script) ###
+ln -s deploy-assets/deploy-script/deploy.sh deploy.sh)"
+}}}
+### Postfix configuration for host email (script) -> run as it is ###
 
 {{{
@@ -246 +249 @@
 {{{
 {
-  "storage-driver": "overlay2",
-  "storage-opts": [
-    "overlay2.override_kernel_check=true"
-  ],
   "log-driver": "fluentd",
   "log-opts": {
@@ -267 +266 @@
 Reference: https://docs.fluentd.org/v1.0/articles/install-by-rpm
 
-Run
+Run as it is:
 
 {{{
 #!/bin/bash
 
-TD_AGENT_VERSION="3.1.1-0.el7"
+TD_AGENT_VERSION="3.2.0-0.el7"
 MULTI_FORMAT_PARSER_VERSION="1.0.0"
 SECURE_FORWARD_PARSER_VERSION="0.4.5"
@@ -330 +329 @@
 ### Td-agent Configuration ###
 
-Create or edit /etc/td-agent/td-agent.conf with the following content:
+Create or edit /etc/td-agent/td-agent.conf with the following content (adapt the variable !`self_hostname`):
 
 {{{