Various fixes that prevented production deployment

ansible/debshots.yml

@@ -1,38 +1,41 @@
 ---
 - hosts: all
+
   vars:
     ruby_version: 2.4.1
+
   handlers:
     - name: restart nginx
       service: name=nginx state=restarted
+
   tasks:
   - name: Install packages
-    apt: name="{{item}}" state=installed
+    apt: name="{{item}}" state=present
     with_items:
       - htop
       - python-psycopg2
       - ruby
-        #- passenger
-        #- nginx-full
+      - sudo
+      - nginx-extras
       - apt-transport-https
       - ca-certificates
-      #- build-essential
-      #- ruby-dev
       - libssl-dev
       - libreadline-dev
       - zlib1g-dev
       - libbz2-dev
       - libpq-dev
-      #- libcurl4-gnutls-dev
-      #- ruby-bundler
-      #- nodejs
       - git
+      - imagemagick
+
+  - name: Remove conflicting packages
+    apt: name=python-openssl state=absent
+      
   - name: Enable Jessie backports repository
     apt_repository: repo="deb http://ftp.debian.org/debian jessie-backports main"
   - name: Set up american locales to avoid warnings about missing locales
     locale_gen: name=en_US.UTF-8 state=present
   - name: Install PostgreSQL
-    apt: name=postgresql state=installed
+    apt: name=postgresql state=present
   - name: Create PostgreSQL user
     become: yes
     become_user: postgres
@@ -43,24 +46,6 @@
     postgresql_db: name=debshots owner=debshots encoding=UTF-8 template=template0
   - name: Create application user
     user: name=debshots groups=adm home=/opt/debshots shell=/bin/bash
-  #- name: Install Passenger Gem
-  #  gem: name=passenger state=present
-  #- name: Install Passenger and Nginx
-  #  shell: passenger-install-nginx-module --auto
-  #- name: Validate installation
-  #  shell: passenger-config validate-install --auto
-  - apt_key: keyserver=keyserver.ubuntu.com id=561F9B9CAC40B2F7
-  - apt_repository: repo="deb https://oss-binaries.phusionpassenger.com/apt/passenger jessie main"
-  - apt: name="{{item}}" state=installed
-    with_items:
-      - nginx-extras 
-      - passenger
-  - name: Enable Passenger in main nginx.conf
-    lineinfile:
-      dest: /etc/nginx/nginx.conf
-      regexp: '# include /etc/nginx/passenger\.conf'
-      line: 'include /etc/nginx/passenger.conf;'
-      backrefs: yes
 
   # Install newer Ruby version using rbenv
   - name: Get rbenv
@@ -80,17 +65,35 @@
       src: files/debshots-bash-profile
       dest: /opt/debshots/.profile
       owner: debshots
+
   - name: Build Ruby version
-    shell: sudo -iu debshots rbenv install -v {{ruby_version}} creates=/opt/debshots/.rbenv/versions/{{ruby_version}}
+    shell: rbenv install -v {{ruby_version}} creates=/opt/debshots/.rbenv/versions/{{ruby_version}}
+    become: yes
+    become_user: debshots
+    become_flags: "-i"
+
+  - name: Set Ruby version to version {{ruby_version}}
+    shell: rbenv local {{ruby_version}}
+    become: yes
+    become_user: debshots
+    become_flags: "-i"
 
   - name: Install certbot to get certificates from Lets Encrypt
     apt: name=certbot default_release=jessie-backports
 
   - name: Install Bundler
-    gem: name=bundler
+    shell: gem install bundler
+    become: yes
+    become_user: debshots
+    become_flags: "-i"
 
   - name: Install dependencies
-    shell: sudo -iu debshots bundle
+    shell: bundle install
+    args:
+      chdir: /opt/debshots
+    become: yes
+    become_user: debshots
+    become_flags: "-i"
 
   - name: Make sure that the public/ directory is readable by nginx
     file: path=/opt/debshots/public mode='go+rx'
@@ -105,4 +108,3 @@
       restart nginx
 
 #  - debug: msg="Please run: certbot certonly --webroot -w /opt/debshots/public -d screenshots.debian.net"
-