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

This commit is contained in:
Marius 2017-02-06 15:12:03 +01:00
commit 9be1ece381
2 changed files with 20 additions and 3 deletions

View File

@ -111,7 +111,22 @@ install {
name = "Install tusd" name = "Install tusd"
roles { roles {
role = "{{{init.paths.roles_dir}}}/apt/1.4.0" role = "{{{init.paths.roles_dir}}}/apt/1.4.0"
apt_install = ["apg", "build-essential", "curl", "git-core", "htop", "iotop", "libpcre3", "logtail", "mlocate", "mtr", "psmisc", "telnet", "vim", "wget"] apt_install = [
"apg",
"build-essential",
"curl",
"git-core",
"htop",
"iotop",
"libpcre3",
"logtail",
"mlocate",
"mtr",
"psmisc",
"telnet",
"vim",
"wget"
]
} }
roles { roles {
role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.3.1" role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.3.1"
@ -167,7 +182,6 @@ setup {
} }
roles { roles {
role = "{{{init.paths.roles_dir}}}/fqdn/1.2.1" role = "{{{init.paths.roles_dir}}}/fqdn/1.2.1"
fqdn = "{{lookup('env', 'FREY_DOMAIN')}}"
} }
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"

View File

@ -8,7 +8,7 @@ apt_upgrade: false
apt_dpkg_configure: true apt_dpkg_configure: true
apt_install_state: present apt_install_state: present
apt_clean: true apt_clean: true
apt_autoremove: true apt_autoremove: false
# ansistrano roles # ansistrano roles
ansistrano_shared_paths: ansistrano_shared_paths:
@ -29,3 +29,6 @@ hostname: "{{ fqdn.split('.')[0] }}"
nodejs_yarn: false nodejs_yarn: false
nodejs_npm_global_packages: nodejs_npm_global_packages:
- name: yarn - name: yarn
# unattended-upgrades
unattended_remove_unused_dependencies: true