Various fixes that prevented production deployment

Gemfile

@@ -83,12 +83,12 @@ gem 'will_paginate'
 # Style the paginator properly to use Zurb Foundation's style
 # https://github.com/acrogenesis/will_paginate-foundation
 # (Does not support Foundation 6 yet.)
-#gem 'will_paginate-foundation'
+gem 'will_paginate-foundation'
 
 # Lightbox image viewer for full-sized images
 gem 'fancybox-rails'
 
-# Trying pg_search for full-text search… too slow with ranking… screw PostgreSQL
+# Full-text search in PostgreSQL
 gem 'pg_search'
 
 # Use SLIM as our templating language

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
+      - sudo
-        #- nginx-full
+      - 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"
-

ansible/files/nginx.conf

@@ -24,10 +24,6 @@ proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=my_cache:10m max_size=10g
 
 log_format proxy '[$time_local] Cache: $upstream_cache_status $upstream_addr $upstream_response_time $status $bytes_sent $remote_addr $request_uri "$http_referer" "$http_user_agent" $scheme';
 
-# Performance
-passenger_max_pool_size 8;
-passenger_max_request_queue_size 200;
-
 limit_req_zone $binary_remote_addr zone=one:20m rate=5r/s;
 
 # Frontend caching and static asset delivery
@@ -37,7 +33,7 @@ server {
     ssl_certificate     /etc/letsencrypt/live/screenshots.debian.net/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/screenshots.debian.net/privkey.pem;
 
-	root /opt/debshots/public;
+	#root /opt/debshots/public;
 	server_name _;
     access_log /var/log/nginx/cache-access.log proxy;
 
@@ -62,7 +58,7 @@ server {
     location /json/ {
         try_files      /maintenance.html @backend;
         proxy_cache my_cache;
-        proxy_pass http://127.0.0.1:8888/;
+        proxy_pass http://127.0.0.1:3000/;
         proxy_cache_lock on;
         proxy_cache_use_stale updating;
         add_header X-Coffee front-json;
@@ -74,12 +70,17 @@ server {
 
     location @backend {
         proxy_cache my_cache;
-        proxy_pass http://127.0.0.1:8888;
+        proxy_set_header x_debian_sso_dn $ssl_client_s_dn;
+        proxy_pass http://127.0.0.1:3000;
 
         # Avoid cache stampede - rather update once and deliver stale content
         proxy_cache_lock on;
         proxy_cache_use_stale updating;
         add_header X-Coffee front-rails;
+
+        # Use sendfile mechanism to deliver files directly
+        proxy_set_header X-Sendfile-Type X-Accel-Redirect;
+        proxy_set_header X-Accel-Mapping /opt/debshots/public/=/__send_file_accel/;
     }
   
     location /assets/ {
@@ -105,49 +106,46 @@ server {
 }
 
 # Backend rails application
-server {
+# server {
-    listen 127.0.0.1:8888;
+#     listen 127.0.0.1:3000;
 
-	root /opt/debshots/public;
+# 	root /opt/debshots/public;
 
-	server_name _;
+# 	server_name _;
-    access_log /var/log/nginx/rails-access.log;
+#     access_log /var/log/nginx/rails-access.log;
 
-    passenger_enabled on;
+#     # Send thumbnails using X-Sendfile / X-Accel-Redirect
-    passenger_ruby /opt/debshots/.rbenv/versions/2.4.1/bin/ruby;
+#     # The correct thumbnail is computed by the Rails application so it cannot be served directly.
+#     location /thumbnail/ {
+#         expires     1h;
+#         proxy_cache_valid 404 15m;
+#         add_header X-Coffee back-thumbnail;
+#         limit_req zone=one burst=30;
+#     }
 
+#     # Send public assets using X-Sendfile / X-Accel-Redirect (e.g. public/images/dummy/...)
+#     location /public/ {
+#         expires     1h;
+#         add_header X-Coffee back-public;
 
-    # Send thumbnails using X-Sendfile / X-Accel-Redirect
+#         # passenger_set_header X-Sendfile-Type X-Accel-Redirect;
-    # The correct thumbnail is computed by the Rails application so it cannot be served directly.
+#         # passenger_env_var HTTP_X_ACCEL_MAPPING /opt/debshots/public/=/__send_file_accel/;
-    location /thumbnail/ {
+#         # passenger_pass_header X-Accel-Redirect;
-        expires     1h;
+#     }
-        proxy_cache_valid 404 15m;
-        add_header X-Coffee back-thumbnail;
-        limit_req zone=one burst=30;
-    }
 
-    # Send public assets using X-Sendfile / X-Accel-Redirect (e.g. public/images/dummy/...)
+#     # Deliver static files directly from Nginx. See https://mattbrictson.com/accelerated-rails-downloads
-    location /public/ {
+#     location /__send_file_accel/ {
-        expires     1h;
+#         internal;
-        add_header X-Coffee back-public;
+#         alias /opt/debshots/public/;
+#         add_header X-Coffee back-accel;
+#         expires     1d;
+#         more_clear_headers 'Set-Cookie';
+#     }
 
-        passenger_set_header X-Sendfile-Type X-Accel-Redirect;
+#     location /secretstatus {
-        passenger_env_var HTTP_X_ACCEL_MAPPING /opt/debshots/public/=/__send_file_accel/;
+#         stub_status;
-        passenger_pass_header X-Accel-Redirect;
+#         access_log   off;
-    }
+#         allow all;
-
+#         add_header X-Coffee back-status;
-    location /__send_file_accel/ {
+#     }
-        internal;
+# }
-        alias /opt/debshots/public/;
-        add_header X-Coffee back-accel;
-        expires     1d;
-        more_clear_headers 'Set-Cookie';
-    }
-
-    location /secretstatus {
-        stub_status;
-        access_log   off;
-        allow all;
-        add_header X-Coffee back-status;
-    }
-}

app/views/logs/_paginator.slim

@@ -1,8 +1,8 @@
 - if @logs.length>0
   // Use different pagination navigators depending on the screen width
   div.show-for-large
-    =will_paginate @logs, :renderer => FoundationPaginationRenderer, :inner_window => 3
+    =will_paginate @logs, :renderer => FoundationPagination::Rails, :inner_window => 3
   div.show-for-medium-only
-    =will_paginate @logs, :renderer => FoundationPaginationRenderer, :inner_window => 1
+    =will_paginate @logs, :renderer => FoundationPagination::Rails, :inner_window => 1
   div.show-for-small-only
-    =will_paginate @logs, :renderer => FoundationPaginationRenderer, :page_links => false
+    =will_paginate @logs, :renderer => FoundationPagination::Rails, :page_links => false

app/views/packages/_paginator.slim

@@ -1,8 +1,8 @@
 - if @packages.length>0
   // Use different pagination navigators depending on the screen width
   div.show-for-large
-    =will_paginate @packages, :renderer => FoundationPaginationRenderer, :inner_window => 3
+    =will_paginate @packages, :renderer => FoundationPagination::Rails, :inner_window => 3
   div.show-for-medium-only
-    =will_paginate @packages, :renderer => FoundationPaginationRenderer, :inner_window => 1
+    =will_paginate @packages, :renderer => FoundationPagination::Rails, :inner_window => 1
   div.show-for-small-only
-    =will_paginate @packages, :renderer => FoundationPaginationRenderer, :page_links => false
+    =will_paginate @packages, :renderer => FoundationPagination::Rails, :page_links => false

app/views/welcome/home.slim

@@ -23,37 +23,38 @@
           .input-group-button
               input.button.postfix type="submit" value="Search"
 
-.grid-container
+- if @newest_upload
- .grid-x.align-spaced
+  .grid-container
-  .large-3.medium-12.small-12.cell.text-center
+  .grid-x.align-spaced
-    h2 Newest upload
+    .large-3.medium-12.small-12.cell.text-center
-    .thumb-height
+      h2 Newest upload
-      a href=package_path(@newest_upload.package.name)
+      .thumb-height
-        = image_tag(@newest_upload.image.url(:thumb, timestamp: false), alt: @newest_upload.caption)
+        a href=package_path(@newest_upload.package.name)
-    p
+          = image_tag(@newest_upload.image.url(:thumb, timestamp: false), alt: @newest_upload.caption)
-      strong
+      p
-        =@newest_upload.package.name
+        strong
-        ' :
+          =@newest_upload.package.name
-      =@newest_upload.package.description
+          ' :
-  .large-3.medium-12.small-12.cell.text-center
+        =@newest_upload.package.description
-    h2 Most popular
+    .large-3.medium-12.small-12.cell.text-center
-    .thumb-height
+      h2 Most popular
-      a href=package_path(@most_popular_package.name)
+      .thumb-height
-        img src=@most_popular_package.screenshots.first.image.url(:thumb, timestamp: false)
+        a href=package_path(@most_popular_package.name)
-    p
+          img src=@most_popular_package.screenshots.first.image.url(:thumb, timestamp: false)
-      strong
+      p
-        =@most_popular_package.name
+        strong
-        ' :
+          =@most_popular_package.name
-      =@most_popular_package.description
+          ' :
-  .large-3.medium-12.small-12.cell.text-center
+        =@most_popular_package.description
-    h2 Contribute
+    .large-3.medium-12.small-12.cell.text-center
-    .thumb-height
+      h2 Contribute
-      a href=upload_path(@most_wanted_package.name)
+      .thumb-height
-        img src="/images/dummy/no-screenshots-upload-one.svg" width="160"
+        a href=upload_path(@most_wanted_package.name)
-    p
+          img src="/images/dummy/no-screenshots-upload-one.svg" width="160"
-      / TODO: Randomly choose one of ~30 packages
+      p
-      ' We lack a screenshot for the
+        / TODO: Randomly choose one of ~30 packages
-      strong =>@most_wanted_package.name
+        ' We lack a screenshot for the
-      ' package. Can you
+        strong =>@most_wanted_package.name
-      a href=package_path(@most_wanted_package.name) provide one
+        ' package. Can you
-      ' ?
+        a href=package_path(@most_wanted_package.name) provide one
+        ' ?

config/environments/production.rb

@@ -43,7 +43,7 @@ Rails.application.configure do
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
+  #config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.

doc/README.Installation

@@ -5,15 +5,12 @@ Prerequisites: A Debian Jessie server.
 Install PIP to get a recent version of Ansible:
 
     apt install python-pip
+    pip install ansible
 
-Tun the Ansible playbook that comes with the debshots repository:
+Run the Ansible playbook that comes with the debshots repository:
 
     cd ansible
-    ansible-playbook debshost.yml
+    ansible-playbook debshots.yml
-
-_(If you get "command not found" then run "hash -r" or "rehash" in your
-shell and try again.)_
-
 
 # Installing debshots the manual way
 
@@ -80,17 +77,23 @@ Clone the debshots Git repository.
 
 ## Migrate database
 
-    bundle exec rake db:migrate RAILS_ENV=production
+    rails db:schema:load RAILS_ENV=production
+    - rails db:migrate RAILS_ENV=production -
 
 In config/database.yml: production: user/password/host must be commented out
 
+## Fill/update the database with information from APT repositories
+
+    rails debshots:update_from_deb_repos RAILS_ENV=production
+    rails debshots:update_longdescription_from_deb_repos RAILS_ENV=production
+
 ## Pre-render the static assets
 
-    bundle exec rake assets:precompile RAILS_ENV=production
+    rails assets:precompile RAILS_ENV=production
-
+    
 ## Test the application:
 
-    bundle exec rails s -b 0.0.0.0 -e production
+    rails s -b 127.0.0.1 -e production
 
 Point your browser to http://...:3000/ and check the web site.
 
@@ -117,155 +120,6 @@ Create a new user record:
     bundle exec debshots:update_longdescription_from_deb_repos
 
 
-
-# Prepare production environment
-
-## Install passenger to run the application behind nginx
-
-Use the Ansible playbook to install Phusion Passenger - the component
-that makes the actual Ruby on Rails web application accessible from
-the Nginx web server.
-
-## Example nginx vhost config
-
-    more_clear_headers 'X-Runtime';
-    more_clear_headers 'X-Powered-By';
-    more_clear_headers 'Server';
-    server_tokens off;
-
-    proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=my_cache:10m max_size=10g inactive=60m use_temp_path=off;
-
-    log_format proxy '[$time_local] Cache: $upstream_cache_status $upstream_addr $upstream_response_time $status $bytes_sent $remote_addr $request_uri "$http_referer" "$http_user_agent" $scheme';
-
-    # Performance
-    passenger_max_pool_size 8;
-    passenger_max_request_queue_size 200;
-
-    limit_req_zone $binary_remote_addr zone=one:20m rate=5r/s;
-
-    # Frontend caching and static asset delivery
-    server {
-        listen 85.25.83.22:80 default_server;
-        listen 85.25.83.22:443 ssl;
-        ssl_certificate     /etc/letsencrypt/live/screenshots.debian.net/fullchain.pem;
-        ssl_certificate_key /etc/letsencrypt/live/screenshots.debian.net/privkey.pem;
-
-    	root /home/debshots/debshots/public;
-    	server_name _;
-        access_log /var/log/nginx/cache-access.log proxy;
-
-        add_header X-Cache-Status $upstream_cache_status;
-
-        # Tell the backend if the protocol used was HTTPS. Otherwise you get an infinite
-        # redirection loop because the backend assumes that HTTP was spoken behind the
-        # proxy.
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-        # Pass on the actual HTTP_HOST ("Host:" header) so that Rails can build proper absolute URLs
-        proxy_set_header Host $host;
-    	gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
-        gzip_proxied any;
-
-        location / {
-            try_files      /maintenance.html @backend;
-            add_header X-Coffee front-main;
-        }
-
-        location /json/ {
-            try_files      /maintenance.html @backend;
-            proxy_cache my_cache;
-            proxy_pass http://127.0.0.1:8888/;
-            proxy_cache_lock on;
-            proxy_cache_use_stale updating;
-            add_header X-Coffee front-json;
-        }
-
-        location /favicon.ico {
-            alias /home/debshots/debshots/public/favicon.ico;
-        }
-
-        location @backend {
-            proxy_cache my_cache;
-            proxy_pass http://127.0.0.1:8888;
-
-            # Avoid cache stampede - rather update once and deliver stale content
-            proxy_cache_lock on;
-            proxy_cache_use_stale updating;
-            add_header X-Coffee front-rails;
-        }
-
-        location /assets/ {
-            alias /home/debshots/debshots/public/assets/;
-            expires     1h;
-            add_header X-Coffee front-assets;
-        }
-        location /logo/ {
-            alias /home/debshots/debshots/public/logo/;
-            expires     1h;
-            add_header X-Coffee front-logo;
-        }
-        location /screenshots/ {
-            alias /home/debshots/debshots/public/screenshots/;
-            expires     max;
-            add_header X-Coffee front-screenshots;
-        }
-        location /images/ {
-            alias /home/debshots/debshots/public/images/;
-            expires     1h;
-            add_header X-Coffee front-images;
-        }
-    }
-
-    # Backend rails application
-    server {
-        listen 127.0.0.1:8888;
-
-    	root /home/debshots/debshots/public;
-
-    	server_name _;
-        access_log /var/log/nginx/rails-access.log;
-
-        passenger_enabled on;
-        passenger_ruby /home/debshots/.rbenv/versions/2.3.1/bin/ruby;
-
-
-        # Send thumbnails using X-Sendfile / X-Accel-Redirect
-        # The correct thumbnail is computed by the Rails application so it cannot be served directly.
-        location /thumbnail/ {
-            expires     1h;
-            proxy_cache_valid 404 15m;
-            add_header X-Coffee back-thumbnail;
-            limit_req zone=one burst=30;
-        }
-
-        # Send public assets using X-Sendfile / X-Accel-Redirect (e.g. public/images/dummy/...)
-        location /public/ {
-            expires     1h;
-            add_header X-Coffee back-public;
-
-            passenger_set_header X-Sendfile-Type X-Accel-Redirect;
-            passenger_env_var HTTP_X_ACCEL_MAPPING /home/debshots/debshots/public/=/__send_file_accel/;
-            passenger_pass_header X-Accel-Redirect;
-        }
-
-        location /__send_file_accel/ {
-            internal;
-            alias /home/debshots/debshots/public/;
-            add_header X-Coffee back-accel;
-            expires     1d;
-            more_clear_headers 'Set-Cookie';
-        }
-
-        location /secretstatus {
-            stub_status;
-            access_log   off;
-            allow all;
-            add_header X-Coffee back-status;
-        }
-    }
-
-
 # Supported URL paths (aka routes)
 
 _For up-to-date information please check config/routes._