diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 5a799e33..57f1aeb9 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -29,7 +29,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| "-e class=please", "-e hostname=please.unglue.it", "-e setdns=true", - "-e branch=sysadmin" + "-e branch=master" ] end @@ -50,8 +50,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Ubuntu 12.04 LTS Precise / PV EBS-SSD boot # alestic 2015.05.05 - aws.instance_type="t1.micro" - #aws.instance_type="m3.medium" + #aws.instance_type="t1.micro" + aws.instance_type="m3.medium" aws.region = "us-east-1" aws.availability_zone = "us-east-1c" diff --git a/vagrant/dev.yml b/vagrant/dev.yml index 6f2f4e6b..ae34d12d 100644 --- a/vagrant/dev.yml +++ b/vagrant/dev.yml @@ -127,7 +127,7 @@ - name: clone the regluit git repo into /opt/regluit sudo: no - git: repo=ssh://git@github.com/Gluejar/regluit.git dest=/opt/regluit accept_hostkey=True force=yes version={{branch | default("dj16ry")}} + git: repo=ssh://git@github.com/Gluejar/regluit.git dest=/opt/regluit accept_hostkey=True force=yes version={{branch | default("master")}} # installing mysql @@ -407,18 +407,18 @@ - name: crontab command: crontab "/opt/regluit/deploy/crontab_{{class}}.txt" - #- name: add ssh keys from public_key directory - # authorized_key: user={{user}} key={{item}} state=present - # with_fileglob: - # - /opt/regluit/deploy/public_keys/* - # sudo: no + - name: add ssh keys from /opt/regluit/deploy/public_keys/ + authorized_key: user={{user}} key={{ lookup('file', item) }} state=present + with_fileglob: + - "../deploy/public_keys/*.pub" + sudo: no - name: add ssh keys from public_key directory authorized_key: user={{user}} key="{{item}}" state=present with_items: - https://github.com/rdhyee.keys - https://github.com/eshellman.keys - sudo: yes + sudo: no - name: add public key from jenkins authorized_key: >