Merge branch 'master' of github.com:tus/tusd

This commit is contained in:
Marius 2017-03-01 19:43:57 +01:00
commit 8a00983980
1 changed files with 6 additions and 12 deletions

View File

@ -131,6 +131,12 @@ install {
roles { roles {
role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.3.1" role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.3.1"
} }
roles {
role = "{{{init.paths.roles_dir}}}/fqdn/1.2.1"
}
roles {
role = "{{{init.paths.roles_dir}}}/timezone/1.0.0"
}
tasks { tasks {
lineinfile = "dest=/home/{{{config.global.ssh.user}}}/.bashrc line=\"alias wtf='sudo tail -f /var/log/*{log,err} /var/log/{dmesg,messages,*{,/*}{log,err}}'\" owner={{{config.global.ssh.user}}} group={{{config.global.ssh.user}}} mode=0644 backup=yes" lineinfile = "dest=/home/{{{config.global.ssh.user}}}/.bashrc line=\"alias wtf='sudo tail -f /var/log/*{log,err} /var/log/{dmesg,messages,*{,/*}{log,err}}'\" owner={{{config.global.ssh.user}}} group={{{config.global.ssh.user}}} mode=0644 backup=yes"
name = "Common | Add convenience shortcut wtf" name = "Common | Add convenience shortcut wtf"
@ -143,15 +149,6 @@ install {
name = "Common | Set motd" name = "Common | Set motd"
copy = "content='Welcome to {{lookup('env', 'FREY_DOMAIN')}}' dest=/etc/motd owner=root group=root mode=0644 backup=yes" copy = "content='Welcome to {{lookup('env', 'FREY_DOMAIN')}}' dest=/etc/motd owner=root group=root mode=0644 backup=yes"
} }
tasks {
name = "Common | Set timezone variables"
copy = "content='Etc/UTC' dest=/etc/timezone owner=root group=root mode=0644 backup=yes"
notify = ["Common | Update timezone"]
}
handlers {
name = "Common | Update timezone"
command = "dpkg-reconfigure --frontend noninteractive tzdata"
}
} }
} }
@ -180,9 +177,6 @@ setup {
} }
} }
} }
roles {
role = "{{{init.paths.roles_dir}}}/fqdn/1.2.1"
}
tasks { tasks {
file = "path=/mnt/tusd-data state=directory owner=www-data group=ubuntu mode=ug+rwX,o= recurse=yes" file = "path=/mnt/tusd-data state=directory owner=www-data group=ubuntu mode=ug+rwX,o= recurse=yes"
name = "tusd | Create tusd data dir" name = "tusd | Create tusd data dir"