rails-ahoy 0.0.2 → 0.0.3

data/lib/generators/ahoy/templates/ansible/playbooks/roles/essentials/templates/vimrc

@@ -25,12 +25,10 @@ NeoBundle 'reedes/vim-colors-pencil'
 NeoBundle 'gcmt/taboo.vim'
 
 " Syntax highlighting
-" NeoBundle 'scrooloose/syntastic'
 NeoBundle 'jtratner/vim-flavored-markdown.git'
 NeoBundle 'elzr/vim-json'
 NeoBundle 'kchmck/vim-coffee-script'
 NeoBundle 'pangloss/vim-javascript'
-" NeoBundle 'chase/vim-ansible-yaml'
 
 " Snippets & autocomplete
 NeoBundle 'sirver/ultisnips'

data/lib/generators/ahoy/templates/ansible/playbooks/roles/nginx/templates/platform.conf

@@ -1,16 +1,16 @@
-upstream {{ app_name }} { 
-  server {{ domain }}:3000;
-  server unix:///var/www/{{ app_name }}/shared/tmp/sockets/puma.sock; 
+upstream {{app_name}} { 
+  server {{server_domain}}:3000;
+  server unix:///var/www/{{app_name}}/shared/tmp/sockets/puma.sock; 
 } 
 server { 
   listen 80;
-  server_name {{ domain }};
-  root /var/www/{{ app_name }}/current/public;
+  server_name {{server_domain}};
+  root /var/www/{{app_name}}/current/public;
 
   location / { 
     proxy_set_header Host $host; 
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 
-    proxy_pass http://{{ app_name }};
+    proxy_pass http://{{app_name}};
   } 
 
   location ~* ^/assets/ { 

data/lib/generators/ahoy/templates/ansible/playbooks/roles/postgresql/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: install dependencies
-  action: apt pkg={{ item }} state=latest
+  action: apt pkg={{item}} state=latest
   with_items:
     - python-apt
     - python-psycopg2
@@ -10,30 +10,30 @@
   apt_key: url=http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc
 
 - name: add apt-get repository for latest postgres
-  apt_repository: repo="deb http://apt.postgresql.org/pub/repos/apt/ {{ ansible_lsb.codename }}-pgdg main"
+  apt_repository: repo="deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_lsb.codename}}-pgdg main"
 
 - name: install postgres
-  apt: name=postgresql-{{ postgresql.version }} state=latest update_cache=true
+  apt: name=postgresql-{{postgresql_version}} state=latest update_cache=true
 
 - name: copy pg_hba.conf
   sudo: true
-  template: src=pg_hba.conf dest=/etc/postgresql/{{ postgresql.version }}/main/pg_hba.conf
+  template: src=pg_hba.conf dest=/etc/postgresql/{{postgresql_version}}/main/pg_hba.conf
 
 - name: set pg_hba.conf permissions
   sudo: true
-  file: path=/etc/postgresql/{{ postgresql.version }}/main/pg_hba.conf owner=postgres group=postgres mode=0640
+  file: path=/etc/postgresql/{{postgresql_version}}/main/pg_hba.conf owner=postgres group=postgres mode=0640
 
 - name: start postgresql
   service: name=postgresql state=started 
 
 - name: create db user
-  postgresql_user: name={{ database.user }} password={{ database.password }} role_attr_flags=CREATEDB
+  postgresql_user: name={{database_user}} password={{database_password}} role_attr_flags=CREATEDB
   sudo_user: postgres
 
 - name: create database
-  postgresql_db: name={{ database.name }} owner={{ database.user }} encoding=unicode lc_collate=en_US.utf8 lc_ctype=en_US.utf8 template=template0
+  postgresql_db: name={{database_name}} owner={{database_user}} encoding=unicode lc_collate=en_US.utf8 lc_ctype=en_US.utf8 template=template0
   sudo_user: postgres
-  when: inventory_hostname == 'production_deploy'
+  when: inventory_hostname == 'deploy'
 
 - name: ensure postgres starts on a fresh reboot
   service: name=postgresql state=started enabled=yes

data/lib/generators/ahoy/templates/ansible/playbooks/roles/ruby/tasks/gems.yml

@@ -1,6 +1,6 @@
 ---
 - name: set gemrc
-  copy: src=gemrc dest=/home/{{ deploy_user }}/.gemrc owner={{ deploy_user}} group={{ deploy_user }} mode=0644
+  copy: src=gemrc dest=/home/{{server_user}}/.gemrc owner={{server_user}} group={{server_user}} mode=0644
 
 - name: install bundler
-  shell: RBENV_ROOT={{ rbenv_root }} rbenv exec gem install bundler --no-ri --no-rdoc
+  shell: RBENV_ROOT={{rbenv_root}} rbenv exec gem install bundler --no-ri --no-rdoc

data/lib/generators/ahoy/templates/ansible/playbooks/roles/ruby/tasks/rbenv.yml

@@ -1,6 +1,6 @@
 ---
 - name: install dependencies
-  apt: pkg={{ item }} state=present
+  apt: pkg={{item}} state=present
   with_items:
     - libqt4-dev
     - libssl-dev
@@ -8,24 +8,24 @@
 
 - name: install rbenv
   sudo: true
-  git: repo=git://github.com/sstephenson/rbenv.git dest={{ rbenv_root }}
+  git: repo=git://github.com/sstephenson/rbenv.git dest={{rbenv_root}}
 
 - name: install ruby-build as rbenv plugin
   sudo: true
-  git: repo=https://github.com/sstephenson/ruby-build.git dest={{ rbenv_root }}/plugins/ruby-build
+  git: repo=https://github.com/sstephenson/ruby-build.git dest={{rbenv_root}}/plugins/ruby-build
 
 - name: change owner of rbenv directory
   sudo: true
-  file: path={{ rbenv_root }} owner={{ deploy_user }} recurse=yes state=directory
+  file: path={{rbenv_root}} owner={{server_user}} recurse=yes state=directory
 
 - name: add rbenv symlink
-  file: path=/usr/local/bin/rbenv src={{ rbenv_root }}/bin/rbenv state=link
+  file: path=/usr/local/bin/rbenv src={{rbenv_root}}/bin/rbenv state=link
 
 - name: export RBENV_ROOT to profile
-  lineinfile: line='export RBENV_ROOT="{{ rbenv_root }}"' dest=/home/{{ deploy_user }}/.profile
+  lineinfile: line='export RBENV_ROOT="{{rbenv_root}}"' dest=/home/{{server_user}}/.profile
 
 - name: export PATH to rbenv bin to profile
-  lineinfile: line='export PATH="{{ rbenv_root }}/bin:$PATH"' dest=/home/{{ deploy_user }}/.profile
+  lineinfile: line='export PATH="{{rbenv_root}}/bin:$PATH"' dest=/home/{{server_user}}/.profile
 
 - name: eval rbenv init
-  lineinfile: line="eval \"$(rbenv init -)\"" dest=/home/{{ deploy_user }}/.profile
+  lineinfile: line="eval \"$(rbenv init -)\"" dest=/home/{{server_user}}/.profile

data/lib/generators/ahoy/templates/ansible/playbooks/roles/ruby/tasks/ruby.yml

@@ -1,15 +1,15 @@
 ---
 - name: check if proper ruby version is installed
-  shell: RBENV_ROOT={{ rbenv_root }} rbenv versions | grep {{ ruby_version }}
+  shell: RBENV_ROOT={{rbenv_root}} rbenv versions | grep {{ruby_version}}
   register: ruby_installed
   ignore_errors: yes
 
 - name: install proper ruby version
-  shell: RBENV_ROOT={{ rbenv_root }} rbenv install {{ ruby_version }}
+  shell: RBENV_ROOT={{rbenv_root}} rbenv install {{ruby_version}}
   when: ruby_installed|failed
 
 - name: set global ruby
-  shell: RBENV_ROOT={{ rbenv_root }} rbenv global {{ ruby_version }}
+  shell: RBENV_ROOT={{rbenv_root}} rbenv global {{ruby_version}}
 
 - name: rehash rbenv
-  shell: RBENV_ROOT={{ rbenv_root }} rbenv rehash
+  shell: RBENV_ROOT={{rbenv_root}} rbenv rehash

data/lib/generators/ahoy/templates/ansible/playbooks/roles/security/tasks/fail2ban.yml

@@ -0,0 +1,4 @@
+---
+- name: install fail2ban
+  apt: name=fail2ban state=present update_cache=true
+  when: inventory_hostname == 'root'

data/lib/generators/ahoy/templates/ansible/playbooks/roles/security/tasks/firewall.yml

@@ -1,6 +1,8 @@
 ---
 - name: setup firewall
   shell: ufw allow 22; ufw allow 1224; ufw allow 80; ufw allow 443
+  when: inventory_hostname == 'root'
 
 - name: enable firewall
   shell: echo 'y' | ufw enable
+  when: inventory_hostname == 'root'

data/lib/generators/ahoy/templates/ansible/playbooks/roles/security/tasks/main.yml

@@ -1,9 +1,4 @@
 ---
-- name: install fail2ban
-  apt: name=fail2ban state=present update_cache=true
-  when: inventory_hostname == 'production_root'
-
+- include: fail2ban.yml
 - include: firewall.yml
-  when: inventory_hostname == 'production_root'
-
 - include: ssh_settings.yml

data/lib/generators/ahoy/templates/{ansible_templates/playbooks/roles/security/tasks/_ssh_settings.yml → ansible/playbooks/roles/security/tasks/ssh_settings.yml}

@@ -1,13 +1,13 @@
 ---
 - name: add local ssh keys to authorized_keys
-  authorized_key: user={{ deploy_user }} key="{{ lookup('file', '~/.ssh/id_rsa.pub') }}"
+  authorized_key: user={{server_user}} key="{{lookup('file', '~/.ssh/id_rsa.pub')}}"
 
 - name: change permissions on authorized_keys
-  file: path=/home/{{ deploy_user }}/.ssh/authorized_keys mode=0400
+  file: path=/home/{{server_user}}/.ssh/authorized_keys mode=0400
 
 - name: change ssh port
   sudo: true
-  action: lineinfile dest=/etc/ssh/sshd_config regexp="^#?Port" line="Port <%= @server_ssh_port == '' ? '22' : @server_ssh_port %>"
+  action: lineinfile dest=/etc/ssh/sshd_config regexp="^#?Port" line="Port {{server_ssh_port}}"
 
 - name: disable root user login via ssh
   sudo: true
@@ -19,7 +19,7 @@
 
 - name: allow deploy user login via ssh
   sudo: true
-  action: lineinfile dest=/etc/ssh/sshd_config insertafter=EOF line="AllowUsers {{ deploy_user }}"
+  action: lineinfile dest=/etc/ssh/sshd_config insertafter=EOF line="AllowUsers {{server_user}}"
 
 - name: restart ssh service
   action: service name=ssh state=restarted

data/lib/generators/ahoy/templates/ansible/playbooks/roles/user/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: create deploy user
-  user: name={{ deploy_user }} shell=/bin/bash generate_ssh_key=yes ssh_key_bits=2048
+- name: create server user
+  user: name={{server_user}} shell=/bin/bash generate_ssh_key=yes ssh_key_bits=2048
 
-- name: allow deploy user sudo commands without password
-  action: lineinfile dest=/etc/sudoers regexp="^root" line="root ALL=(ALL:ALL) ALL\n{{ deploy_user }} ALL=(ALL) NOPASSWD:ALL" state=present
+- name: allow server user sudo commands without password
+  action: lineinfile dest=/etc/sudoers regexp="^root" line="root ALL=(ALL:ALL) ALL\n{{server_user}} ALL=(ALL) NOPASSWD:ALL" state=present

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/application.yml

@@ -0,0 +1,21 @@
+---
+- name: check if .env exists
+  stat: path=/var/www/{{app_root}}/shared/.env/production_env.yml
+  register: env_file
+
+- name: delete .env if exists
+  shell: rm /var/www/{{app_root}}/shared/.env/production_env.yml
+  when: env_file.stat.exists == true
+
+- name: add environment variables to .env
+  lineinfile:
+    dest=/var/www/{{app_root}}/shared/.env/production_env.yml
+    line='{{item}}'
+    owner={{server_user}}
+    insertafter=EOF
+    create=true
+  with_items:
+    - 'database_name: {{database_name}}'
+    - 'database_user: {{database_user}}'
+    - 'database_password: {{database_password}}'
+    - 'secret_key_base: {{secret_key_base}}'

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/main.yml

@@ -0,0 +1,3 @@
+---
+- include: system.yml
+- include: application.yml

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/system.yml

@@ -0,0 +1,25 @@
+---
+- name: check if .profile exists
+  stat: path=/home/{{server_user}}/.profile
+  register: profile_file
+
+- name: delete .profile if exists
+  shell: rm /home/{{server_user}}/.profile
+  when: profile_file.stat.exists == true
+
+- name: recreate .profile from a clean template
+  template: src=profile dest=/home/{{server_user}}/.profile owner=deploy group=deploy
+
+- name: add environment variables to .profile
+  lineinfile:
+    dest=/home/{{server_user}}/.profile
+    line='{{item}}'
+    owner={{server_user}}
+    insertafter=EOF
+    create=true
+  with_items:
+    - export APP_NAME={{app_name}}
+    - export APP_ROOT={{app_root}}
+    - export APP_DOMAIN="{{server_domain}}"
+    - export APP_REPO="{{app_repo}}"
+    - export APP_REPO_BRANCH={{app_repo_branch}}

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/templates/profile

@@ -0,0 +1,22 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+ 
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+ 
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+	. "$HOME/.bashrc"
+    fi
+fi
+ 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi

data/lib/generators/ahoy/templates/ansible/playbooks/tasks/vagrant_settings.yml

@@ -1,3 +1,3 @@
 ---
 - name: cd to vagrant directory by default
-  lineinfile: line="cd /vagrant" dest=/home/{{ deploy_user }}/.profile state=present
+  lineinfile: line="cd /vagrant" dest=/home/vagrant/.profile state=present

data/lib/generators/ahoy/templates/ansible/production.sh

@@ -0,0 +1 @@
+ansible-playbook playbooks/production.yml -i production

data/lib/generators/ahoy/templates/ansible_templates/_production

@@ -0,0 +1,5 @@
+[production]
+root ansible_ssh_host=<%= Ahoy::VariableStore.variables['server_domain'] == '' ? '127.0.0.1' : Ahoy::VariableStore.variables['server_domain'] %>
+
+[production]
+deploy ansible_ssh_host=<%= Ahoy::VariableStore.variables['server_domain'] == '' ? '127.0.0.1' : Ahoy::VariableStore.variables['server_domain'] %> ansible_ssh_port=<%= Ahoy::VariableStore.variables['server_ssh_port'] == '' ? '22' : Ahoy::VariableStore.variables['server_ssh_port'] %>

data/lib/generators/ahoy/templates/{ansible/playbooks/playbook.yml → ansible_templates/playbooks/_production.yml}

@@ -1,22 +1,21 @@
 ---
-# Production playbook
+# production playbook
 #==========================================================
-- hosts: production_root
+- hosts: root
   sudo: true
   user: root
   roles:
     - role: user
     - role: security
 
-- hosts: production_deploy
+- hosts: deploy
   sudo: true
-  user: deploy
-  vars_files:
-    - ../../env_vars.yml
+  user: <%= Ahoy::VariableStore.variables['server_user'] %>
   roles:
     - role: essentials
     - role: nodejs
     - role: nginx
     - role: postgresql
     - role: ruby
-    - role: deploy_env
+    - role: variables
+    - role: complete

data/lib/generators/ahoy/templates/ansible_templates/playbooks/_vagrant.yml

@@ -0,0 +1,17 @@
+---
+# Vagrant playbook
+#==========================================================
+- hosts: default
+  sudo: true
+  vars:
+    - server_user: vagrant
+    - database_user: vagrant
+    - database_password: vagrant
+  roles:
+    - role: user
+    - role: essentials
+    - role: nodejs
+    - role: postgresql
+    - role: ruby
+  tasks:
+    - include: tasks/vagrant_settings.yml

data/lib/generators/ahoy/templates/ansible_templates/playbooks/group_vars/_all.yml

@@ -1,6 +1,4 @@
 ---
-app_name: <%= Rails.application.class.parent_name.underscore %>
-postgresql:
-  version: <%= @postgresql_version == '' ? '9.3' : @postgresql_version %>
-ruby_version: <%= @ruby_version == '' ? '2.1.5' : @ruby_version %>
+postgresql_version: <%= Ahoy::VariableStore.variables['postgresql_version'] %>
+ruby_version: <%= Ahoy::VariableStore.variables['ruby_version'] %>
 rbenv_root: /usr/local/rbenv

data/lib/generators/ahoy/templates/ansible_templates/playbooks/group_vars/_production.yml

@@ -0,0 +1,11 @@
+---
+server:
+  user: <%= Ahoy::VariableStore.variables['server_user'] %>
+  ssh_port: <%= Ahoy::VariableStore.variables['server_ssh_port'] %>
+app:
+  root: <%= Ahoy::VariableStore.variables['app_name'] %>
+  secret_key_base: ea25c34b9d9443935394356303a408d19d5613ccdb77de0bc98c5ac57dcb5d19b53f03f13fd402926778b8f6fe6be81b67d9f206d16f5fe3145b9049a6fee582
+database:
+  name: <%= Ahoy::VariableStore.variables['database_name'] %>
+  user: <%= Ahoy::VariableStore.variables['database_user'] %>
+  password: <%= Ahoy::VariableStore.variables['database_password'] %>

data/lib/generators/ahoy/templates/env_templates/_development_env.yml

@@ -0,0 +1 @@
+---

data/lib/generators/ahoy/templates/env_templates/_production_env.yml

@@ -0,0 +1,12 @@
+---
+server_user: <%= Ahoy::VariableStore.variables['server_user'] %>
+server_domain: <%= Ahoy::VariableStore.variables['server_domain'] %>
+server_ssh_port: <%= Ahoy::VariableStore.variables['server_ssh_port'] %>
+app_name: <%= Ahoy::VariableStore.variables['app_name'] %>
+app_root: <%= Ahoy::VariableStore.variables['app_name'] %>
+database_name: <%= Ahoy::VariableStore.variables['database_name'] %>
+database_user: <%= Ahoy::VariableStore.variables['database_user'] %>
+database_password: <%= Ahoy::VariableStore.variables['database_password'] %>
+app_repo: <%= Ahoy::VariableStore.variables['app_repo'] %>
+app_repo_branch: <%= Ahoy::VariableStore.variables['app_repo_branch'] %>
+secret_key_base:

data/lib/generators/ahoy/templates/env_templates/_test_env.yml

@@ -0,0 +1 @@
+---

data/lib/generators/ahoy/vagrant_generator.rb

@@ -1,52 +1,52 @@
 require 'rails/generators'
 require 'generators/ahoy/base'
+require 'generators/ahoy/lib/question_helper'
+require 'generators/ahoy/lib/variable_store'
+require 'fileutils'
 
 module Ahoy
   class VagrantGenerator < Ahoy::Generator::Base
 
     def use_vagrant
-      defaults('No')
-      @use_vagrant = yes?('=> Would you like to use Vagrant with your project?')
+      question :boolean do
+        {
+          use_vagrant: 'Would you like to use Vagrant with your project?',
+          default: 'No'
+        }
+      end
     end
 
     def prompt_user
-      if @use_vagrant
-        defaults('2')
-        @memory = ask('=> How many Megabytes of memory would you like to allocate to your VM? [enter for default]').to_i
-        defaults('1')
-        @cpus = ask('=> How many CPUs would you like to allocated? [enter for default]').to_i
-        copy_templates
-        append_ansible_playbook
+      if Ahoy::VariableStore.variables['use_vagrant'] == true
+        question :string do
+          {
+            vagrant_memory: 'How many Megabytes of memory would you like to allocate to your VM? [enter for default]',
+            default: '2'
+          }
+        end
+        question :string do
+          {
+            vagrant_cpus: 'How many CPUs would you like to allocated? [enter for default]',
+            default: '1'
+          }
+        end
       else
         puts 'Skipping Vagrant'
+        exit
       end
     end
 
-    private
+    def copy_files
+      copy_file 'ansible_templates/playbooks/_vagrant.yml', 'config/ansible/playbooks/vagrant.yml'
+    end
 
-    def copy_templates
-      template '_Vagrantfile', 'Vagrantfile'
-      template '_database.yml', 'config/database.yml'
-      template 'ansible_templates/playbooks/host_vars/_default.yml', 'config/ansible/playbooks/host_vars/default.yml'
+    def backup_files
+      FileUtils.mv 'config/database.yml', 'config/database.yml.bak'
     end
 
-    def append_ansible_playbook
-      append_file 'config/ansible/playbooks/playbook.yml', VAGRANT_PLAYBOOK
+    def copy_templates
+      template '_database.yml', 'config/database.yml'
+      template '_Vagrantfile', 'Vagrantfile'
     end
   end
 end
-
-VAGRANT_PLAYBOOK = "
-# Vagrant playbook
-#==========================================================
-- hosts: default
-  sudo: true
-  roles:
-    - role: user
-    - role: essentials
-    - role: nodejs
-    - role: postgresql
-    - role: ruby
-  tasks:
-    - include: tasks/vagrant_settings.yml
-"