Merge remote-tracking branch 'upstream/micha' into micha

This commit is contained in:
Mischa ter Smitten 2016-12-15 09:51:28 +01:00
commit 915bb348be
1 changed files with 10 additions and 7 deletions

View File

@ -113,12 +113,15 @@ install {
name = "Install tusd" name = "Install tusd"
roles { roles {
role = "{{{init.paths.roles_dir}}}/apt/v1.0.0" role = "{{{init.paths.roles_dir}}}/apt/1.3.0"
apt_packages = ["apg", "build-essential", "curl", "git-core", "htop", "iotop", "libpcre3", "logtail", "mlocate", "mtr", "psmisc", "telnet", "vim", "wget"] apt_manage_sources_list = true
apt_src_enable = false
apt_install = ["apg", "build-essential", "curl", "git-core", "htop", "iotop", "libpcre3", "logtail", "mlocate", "mtr", "psmisc", "telnet", "vim", "wget"]
apt_install_state = "present"
} }
roles { roles {
role = "{{{init.paths.roles_dir}}}/unattended-upgrades/v1.2.0" role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.2.0"
} }
tasks { tasks {
@ -166,7 +169,7 @@ setup {
name = "Setup tusd" name = "Setup tusd"
roles { roles {
role = "{{{init.paths.roles_dir}}}/upstart/v1.0.0" role = "{{{init.paths.roles_dir}}}/upstart/1.0.0"
upstart_command = "./tusd -port=8080 -dir=/mnt/tusd-data -store-size=10737418240" upstart_command = "./tusd -port=8080 -dir=/mnt/tusd-data -store-size=10737418240"
upstart_description = "tusd server" upstart_description = "tusd server"
upstart_name = "{{{config.global.appname}}}" upstart_name = "{{{config.global.appname}}}"
@ -178,7 +181,7 @@ setup {
} }
roles { roles {
role = "{{{init.paths.roles_dir}}}/rsyslog/v3.0.2" role = "{{{init.paths.roles_dir}}}/rsyslog/3.1.0"
rsyslog_rsyslog_d_files "49-tusd" { rsyslog_rsyslog_d_files "49-tusd" {
directives = ["& stop"] directives = ["& stop"]
rules { rules {
@ -189,7 +192,7 @@ setup {
} }
roles { roles {
role = "{{{init.paths.roles_dir}}}/fqdn/v1.0.0" role = "{{{init.paths.roles_dir}}}/fqdn/1.0.0"
fqdn = "{{lookup('env', 'FREY_DOMAIN')}}" fqdn = "{{lookup('env', 'FREY_DOMAIN')}}"
} }
@ -215,7 +218,7 @@ deploy {
name = "Deploy tusd" name = "Deploy tusd"
roles { roles {
role = "{{{init.paths.roles_dir}}}/deploy/v1.4.0" role = "{{{init.paths.roles_dir}}}/deploy/1.4.0"
ansistrano_get_url = "https://github.com/tus/tusd/releases/download/0.5.2/tusd_linux_amd64.tar.gz" ansistrano_get_url = "https://github.com/tus/tusd/releases/download/0.5.2/tusd_linux_amd64.tar.gz"
ansistrano_deploy_to = "{{{config.global.approot}}}" ansistrano_deploy_to = "{{{config.global.approot}}}"
ansistrano_deploy_via = "download_unarchive" ansistrano_deploy_via = "download_unarchive"