Upgrade diaspora to latest version

Remove Gemfile and Gemfile.lock and use instead the ones from the
repository

5 files changed, 34 insertions, 1244 deletions

diff --git a/nixops/modules/websites/tools/diaspora/Gemfile b/nixops/modules/websites/tools/diaspora/Gemfile
deleted file mode 100644
index e279514..0000000
--- a/nixops/modules/websites/tools/diaspora/Gemfile
+++ /dev/null
@@ -1,318 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gem "rails", "5.1.6"
-
-# Legacy Rails features, remove me!
-# responders (class level)
-gem "responders", "2.4.0"
-
-# Appserver
-
-gem "unicorn", "5.4.1", require: false
-gem "unicorn-worker-killer", "0.4.4"
-
-# Federation
-
-gem "diaspora_federation-json_schema", "0.2.5"
-gem "diaspora_federation-rails", "0.2.5"
-
-# API and JSON
-
-gem "acts_as_api", "1.0.1"
-gem "json",        "2.1.0"
-gem "json-schema", "2.8.1"
-
-# Authentication
-
-gem "devise", "4.5.0"
-gem "devise_lastseenable", "0.0.6"
-
-# Captcha
-
-gem "simple_captcha2", "0.4.3", require: "simple_captcha"
-
-# Background processing
-
-gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
-gem "sidekiq", "5.2.3"
-
-# Scheduled processing
-
-gem "sidekiq-cron", "1.0.4"
-
-# Compression
-
-gem "uglifier", "4.1.19"
-
-# Configuration
-
-gem "configurate", "0.3.1"
-
-# Cross-origin resource sharing
-
-gem "rack-cors", "1.0.2", require: "rack/cors"
-
-# CSS
-
-gem "autoprefixer-rails",     "8.6.5"
-gem "bootstrap-sass",         "3.3.7"
-gem "bootstrap-switch-rails", "3.3.4"
-gem "compass-rails",          "3.1.0"
-gem "sass-rails",             "5.0.7"
-gem "sprockets-rails",        "3.2.1"
-
-# Database
-
-group :mysql, optional: true do
-  gem "mysql2", "0.5.2"
-end
-gem "pg",     "1.1.3"
-
-
-gem "activerecord-import", "0.27.0"
-
-# File uploading
-
-gem "carrierwave", "1.2.3"
-gem "fog-aws",     "3.3.0"
-gem "mini_magick", "4.9.2"
-
-# GUID generation
-gem "uuid", "2.3.9"
-
-# Icons
-
-gem "entypo-rails", "3.0.0"
-
-# JavaScript
-
-gem "handlebars_assets", "0.23.2"
-gem "jquery-rails",      "4.3.3"
-gem "js-routes",         "1.4.4"
-gem "js_image_paths",    "0.1.1"
-
-source "https://rails-assets.org" do
-  gem "rails-assets-jquery",                              "3.3.1" # Should be kept in sync with jquery-rails
-  gem "rails-assets-jquery.ui",                           "1.11.4"
-
-  gem "rails-assets-highlightjs",                         "9.12.0"
-  gem "rails-assets-markdown-it",                         "8.4.2"
-  gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
-  gem "rails-assets-markdown-it-diaspora-mention",        "1.2.0"
-  gem "rails-assets-markdown-it-sanitizer",               "0.4.3"
-  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
-  gem "rails-assets-markdown-it-sub",                     "1.0.0"
-  gem "rails-assets-markdown-it-sup",                     "1.0.0"
-
-  gem "rails-assets-backbone",                            "1.3.3"
-  gem "rails-assets-bootstrap-markdown",                  "2.10.0"
-  gem "rails-assets-corejs-typeahead",                    "1.2.1"
-  gem "rails-assets-fine-uploader",                       "5.13.0"
-
-  # jQuery plugins
-
-  gem "rails-assets-autosize",                            "4.0.2"
-  gem "rails-assets-blueimp-gallery",                     "2.33.0"
-  gem "rails-assets-jquery.are-you-sure",                 "1.9.0"
-  gem "rails-assets-jquery-placeholder",                  "2.3.1"
-  gem "rails-assets-jquery-textchange",                   "0.2.3"
-  gem "rails-assets-utatti-perfect-scrollbar",            "1.4.0"
-end
-
-gem "markdown-it-html5-embed", "1.0.0"
-
-# Localization
-
-gem "http_accept_language", "2.1.1"
-gem "i18n-inflector-rails", "1.0.7"
-gem "rails-i18n",           "5.1.2"
-
-# Mail
-
-gem "markerb",             "1.1.0"
-
-# Map
-gem "leaflet-rails",       "1.3.1"
-
-# Parsing
-
-gem "nokogiri",          "1.8.5"
-gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
-gem "redcarpet",         "3.4.0"
-gem "ruby-oembed",       "0.12.0"
-gem "twitter-text",      "1.14.7"
-
-# RTL support
-
-gem "string-direction", "1.2.1"
-
-# Security Headers
-
-gem "secure_headers", "6.0.0"
-
-# Services
-
-gem "omniauth",           "1.8.1"
-gem "omniauth-tumblr",    "1.2"
-gem "omniauth-twitter",   "1.4.0"
-gem "omniauth-wordpress", "0.2.2"
-gem "twitter",            "6.2.0"
-
-# OpenID Connect
-gem "openid_connect", "1.1.6"
-
-# Serializers
-
-gem "active_model_serializers", "0.9.7"
-
-# XMPP chat dependencies
-gem "diaspora-prosody-config",    "0.0.7"
-gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://rails-assets.org"
-
-# Tags
-
-gem "acts-as-taggable-on", "6.0.0"
-
-# URIs and HTTP
-
-gem "addressable",        "2.5.2", require: "addressable/uri"
-gem "faraday",            "0.15.3"
-gem "faraday_middleware", "0.12.2"
-gem "faraday-cookie_jar", "0.0.6"
-gem "typhoeus",           "1.3.1"
-
-# Views
-
-gem "gon",                     "6.2.1"
-gem "hamlit",                  "2.9.1"
-gem "mobile-fu",               "1.4.0"
-gem "rails-timeago",           "2.16.0"
-gem "will_paginate",           "3.1.6"
-
-# Logging
-
-gem "logging-rails", "0.6.0", require: "logging/rails"
-
-# Reading and writing zip files
-
-gem "rubyzip", "1.2.2", require: "zip"
-
-# Prevent occasions where minitest is not bundled in
-# packaged versions of ruby. See following issues/prs:
-# https://github.com/gitlabhq/gitlabhq/issues/3826
-# https://github.com/gitlabhq/gitlabhq/pull/3852
-# https://github.com/discourse/discourse/pull/238
-gem "minitest"
-
-gem "versionist", "1.7.0"
-
-# Windows and OSX have an execjs compatible runtime built-in, Linux users should
-# install Node.js or use "therubyracer".
-#
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-
-# gem "therubyracer", :platform => :ruby
-
-# LDAP
-gem 'net-ldap', '~> 0.16'
-
-group :production do # we don"t install these on travis to speed up test runs
-  # Analytics
-
-  gem "rack-google-analytics", "1.2.0"
-  gem "rack-piwik",            "0.3.0",  require: "rack/piwik"
-
-  # Process management
-
-  gem "eye", "0.10.0"
-
-  # Redirects
-
-  gem "rack-rewrite", "1.5.1", require: false
-  gem "rack-ssl",     "1.4.1", require: "rack/ssl"
-
-  # Third party asset hosting
-
-  gem "asset_sync", "2.5.0", require: false
-end
-
-group :development do
-  # Automatic test runs
-  gem "guard",          "2.15.0", require: false
-  gem "guard-rspec",    "4.7.3", require: false
-  gem "guard-rubocop",  "1.3.0", require: false
-  gem "rb-fsevent",     "0.10.3", require: false
-  gem "rb-inotify",     "0.9.10", require: false
-
-  # Linters
-  gem "haml_lint",      "0.28.0", require: false
-  gem "pronto",         "0.9.5", require: false
-  gem "pronto-eslint",  "0.9.1", require: false
-  gem "pronto-haml",    "0.9.0", require: false
-  gem "pronto-rubocop", "0.9.1", require: false
-  gem "pronto-scss",    "0.9.1", require: false
-  gem "rubocop",        "0.60.0", require: false
-
-  # Preloading environment
-
-  gem "spring", "2.0.2"
-  gem "spring-commands-rspec", "1.0.4"
-  gem "spring-commands-cucumber", "1.0.1"
-
-  # Debugging
-  gem "pry"
-  gem "pry-byebug"
-
-  # test coverage
-  gem "simplecov", "0.16.1", require: false
-
-  gem "turbo_dev_assets", "0.0.2"
-end
-
-group :test do
-  # RSpec (unit tests, some integration tests)
-
-  gem "fixture_builder",   "0.5.2.rc3"
-  gem "fuubar",            "2.3.2"
-  gem "json-schema-rspec", "0.0.4"
-  gem "rspec-json_expectations", "~> 2.1"
-
-  # Cucumber (integration tests)
-
-  gem "capybara",           "3.11.1"
-  gem "database_cleaner",   "1.7.0"
-  gem "poltergeist",        "1.18.1"
-
-  gem "cucumber-api-steps", "0.14", require: false
-
-  # General helpers
-
-  gem "factory_girl_rails", "4.8.0"
-  gem "shoulda-matchers",   "3.1.2"
-  gem "timecop",            "0.9.1"
-  gem "webmock",            "3.4.2", require: false
-
-  gem "diaspora_federation-test", "0.2.5"
-
-  # Coverage
-  gem "coveralls", "0.8.22", require: false
-end
-
-group :development, :test do
-  # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "3.8.1"
-
-  # Cucumber (integration tests)
-  gem "cucumber-rails", "1.6.0", require: false
-
-  # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "3.3.0"
-  gem "jasmine-jquery-rails",      "2.0.3"
-  gem "rails-assets-jasmine-ajax", "3.4.0", source: "https://rails-assets.org"
-  gem "sinon-rails",               "1.15.0"
-
-  # For `assigns` in controller specs
-  gem "rails-controller-testing", "1.0.2"
-end
diff --git a/nixops/modules/websites/tools/diaspora/Gemfile.lock b/nixops/modules/websites/tools/diaspora/Gemfile.lock
deleted file mode 100644
index ceb08c1..0000000
--- a/nixops/modules/websites/tools/diaspora/Gemfile.lock
+++ /dev/null
@@ -1,909 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  remote: https://rails-assets.org/
-  specs:
-    actioncable (5.1.6)
-      actionpack (= 5.1.6)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.6)
-      actionview (= 5.1.6)
-      activesupport (= 5.1.6)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6)
-      activesupport (= 5.1.6)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.9.7)
-      activemodel (>= 3.2)
-      concurrent-ruby (~> 1.0)
-    activejob (5.1.6)
-      activesupport (= 5.1.6)
-      globalid (>= 0.3.6)
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
-      arel (~> 8.0)
-    activerecord-import (0.27.0)
-      activerecord (>= 3.2)
-    activesupport (5.1.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    acts-as-taggable-on (6.0.0)
-      activerecord (~> 5.0)
-    acts_as_api (1.0.1)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      rack (>= 1.1.0)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    aes_key_wrap (1.0.1)
-    arel (8.0.0)
-    asset_sync (2.5.0)
-      activemodel (>= 4.1.0)
-      fog-core
-      mime-types (>= 2.99)
-      unf
-    ast (2.4.0)
-    attr_required (1.0.1)
-    autoprefixer-rails (8.6.5)
-      execjs
-    backports (3.11.4)
-    bcrypt (3.1.12)
-    bindata (2.4.4)
-    bootstrap-sass (3.3.7)
-      autoprefixer-rails (>= 5.2.1)
-      sass (>= 3.3.4)
-    bootstrap-switch-rails (3.3.4)
-    buftok (0.2.0)
-    builder (3.2.3)
-    byebug (10.0.2)
-    capybara (3.11.1)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
-      xpath (~> 3.2)
-    carrierwave (1.2.3)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
-    celluloid (0.17.3)
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-io (0.17.3)
-      celluloid (>= 0.17.2)
-      nio4r (>= 1.1)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.6)
-      timers (>= 4.1.1)
-    chunky_png (1.3.10)
-    cliver (0.3.2)
-    coderay (1.1.2)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
-    compass-rails (3.1.0)
-      compass (~> 1.0.0)
-      sass-rails (< 5.1)
-      sprockets (< 4.0)
-    concurrent-ruby (1.1.3)
-    configurate (0.3.1)
-    connection_pool (2.2.2)
-    coveralls (0.8.22)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
-      tins (~> 1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    crass (1.0.4)
-    cucumber (3.1.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-api-steps (0.14.0)
-      cucumber (>= 2.0.2)
-      jsonpath (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-rails (1.6.0)
-      capybara (>= 1.1.2, < 4)
-      cucumber (>= 3.0.2, < 4)
-      mime-types (>= 1.17, < 4)
-      nokogiri (~> 1.8)
-      railties (>= 4, < 6)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    database_cleaner (1.7.0)
-    devise (4.5.0)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
-      responders
-      warden (~> 1.2.3)
-    devise_lastseenable (0.0.6)
-      devise
-      rails (>= 3.0.4)
-    diaspora-prosody-config (0.0.7)
-    diaspora_federation (0.2.5)
-      faraday (>= 0.9.0, < 0.16.0)
-      faraday_middleware (>= 0.10.0, < 0.13.0)
-      nokogiri (~> 1.6, >= 1.6.8)
-      typhoeus (~> 1.0)
-      valid (~> 1.0)
-    diaspora_federation-json_schema (0.2.5)
-    diaspora_federation-rails (0.2.5)
-      actionpack (>= 4.2, < 6)
-      diaspora_federation (= 0.2.5)
-    diaspora_federation-test (0.2.5)
-      diaspora_federation (= 0.2.5)
-      fabrication (~> 2.16)
-      uuid (~> 2.3, >= 2.3.8)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    entypo-rails (3.0.0)
-      railties (>= 4.1, < 6)
-    equalizer (0.0.11)
-    erubi (1.7.1)
-    eslintrb (2.1.0)
-      execjs
-      multi_json (>= 1.3)
-      rake
-    et-orbi (1.1.6)
-      tzinfo
-    ethon (0.11.0)
-      ffi (>= 1.3.0)
-    excon (0.62.0)
-    execjs (2.7.0)
-    eye (0.10.0)
-      celluloid (~> 0.17.3)
-      celluloid-io (~> 0.17.0)
-      kostya-sigar (~> 2.0.0)
-      state_machines
-      thor
-    fabrication (2.20.1)
-    factory_girl (4.8.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
-      railties (>= 3.0.0)
-    faraday (0.15.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
-      http-cookie (~> 1.0.0)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.25)
-    fixture_builder (0.5.2.rc3)
-      activerecord (>= 2)
-      activesupport (>= 2)
-      hashdiff
-    fog-aws (3.3.0)
-      fog-core (~> 2.1)
-      fog-json (~> 1.1)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (2.1.2)
-      builder
-      excon (~> 0.58)
-      formatador (~> 0.2)
-      mime-types
-    fog-json (1.2.0)
-      fog-core
-      multi_json (~> 1.10)
-    fog-xml (0.1.3)
-      fog-core
-      nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.2.5)
-    fugit (1.1.6)
-      et-orbi (~> 1.1, >= 1.1.6)
-      raabro (~> 1.1)
-    fuubar (2.3.2)
-      rspec-core (~> 3.0)
-      ruby-progressbar (~> 1.4)
-    get_process_mem (0.2.3)
-    gherkin (5.1.0)
-    gitlab (4.7.0)
-      httparty (>= 0.14.0)
-      terminal-table (>= 1.5.1)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    gon (6.2.1)
-      actionpack (>= 3.0)
-      multi_json
-      request_store (>= 1.0)
-    guard (2.15.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
-    haml (5.0.4)
-      temple (>= 0.8.0)
-      tilt
-    haml_lint (0.28.0)
-      haml (>= 4.0, < 5.1)
-      rainbow
-      rake (>= 10, < 13)
-      rubocop (>= 0.50.0)
-      sysexits (~> 1.1)
-    hamlit (2.9.1)
-      temple (>= 0.8.0)
-      thor
-      tilt
-    handlebars_assets (0.23.2)
-      execjs (~> 2.0)
-      sprockets (>= 2.0.0)
-      tilt (>= 1.2)
-    hashdiff (0.3.7)
-    hashie (3.5.7)
-    http (3.3.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (2.1.1)
-    http_accept_language (2.1.1)
-    http_parser.rb (0.6.0)
-    httparty (0.16.3)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    httpclient (2.8.3)
-    i18n (1.1.1)
-      concurrent-ruby (~> 1.0)
-    i18n-inflector (2.6.7)
-      i18n (>= 0.4.1)
-    i18n-inflector-rails (1.0.7)
-      actionpack (>= 3.0.0)
-      i18n-inflector (~> 2.6)
-      railties (>= 3.0.0)
-    ipaddress (0.8.3)
-    jaro_winkler (1.5.1)
-    jasmine (3.3.0)
-      jasmine-core (~> 3.3.0)
-      phantomjs
-      rack (>= 1.2.1)
-      rake
-    jasmine-core (3.3.0)
-    jasmine-jquery-rails (2.0.3)
-    jquery-rails (4.3.3)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    js-routes (1.4.4)
-      railties (>= 3.2)
-      sprockets-rails
-    js_image_paths (0.1.1)
-      rails (>= 4.0, < 6.0)
-      sprockets (>= 3.0.0)
-    json (2.1.0)
-    json-jwt (1.9.4)
-      activesupport
-      aes_key_wrap
-      bindata
-    json-schema (2.8.1)
-      addressable (>= 2.4)
-    json-schema-rspec (0.0.4)
-      json-schema (~> 2.5)
-      rspec
-    jsonpath (0.9.6)
-      multi_json
-      to_regexp (~> 0.2.1)
-    jwt (2.1.0)
-    kgio (2.11.2)
-    kostya-sigar (2.0.4)
-    leaflet-rails (1.3.1)
-      rails (>= 4.2.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    logging-rails (0.6.0)
-      logging (>= 1.8)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    lumberjack (1.0.13)
-    macaddr (1.7.1)
-      systemu (~> 2.6.2)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    markdown-it-html5-embed (1.0.0)
-    markerb (1.1.0)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    method_source (0.9.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mini_magick (4.9.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mobile-fu (1.4.0)
-      rack-mobile-detect
-      rails
-    multi_json (1.13.1)
-    multi_test (0.1.2)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    mysql2 (0.5.2)
-    naught (1.1.0)
-    nenv (0.3.0)
-    net-ldap (0.16.1)
-    nio4r (2.3.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    oauth (0.5.4)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    octokit (4.13.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    omniauth (1.8.1)
-      hashie (>= 3.4.6, < 3.6.0)
-      rack (>= 1.6.2, < 3)
-    omniauth-oauth (1.1.0)
-      oauth
-      omniauth (~> 1.0)
-    omniauth-oauth2 (1.5.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.2)
-    omniauth-tumblr (1.2)
-      multi_json
-      omniauth-oauth (~> 1.0)
-    omniauth-twitter (1.4.0)
-      omniauth-oauth (~> 1.1)
-      rack
-    omniauth-wordpress (0.2.2)
-      omniauth-oauth2 (>= 1.1.0)
-    open_graph_reader (0.6.2)
-      faraday (>= 0.9.0)
-      nokogiri (~> 1.6)
-    openid_connect (1.1.6)
-      activemodel
-      attr_required (>= 1.0.0)
-      json-jwt (>= 1.5.0)
-      rack-oauth2 (>= 1.6.1)
-      swd (>= 1.0.0)
-      tzinfo
-      validate_email
-      validate_url
-      webfinger (>= 1.0.1)
-    orm_adapter (0.5.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
-    pg (1.1.3)
-    phantomjs (2.1.1.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
-    powerpack (0.1.2)
-    pronto (0.9.5)
-      gitlab (~> 4.0, >= 4.0.0)
-      httparty (>= 0.13.7)
-      octokit (~> 4.7, >= 4.7.0)
-      rainbow (~> 2.1)
-      rugged (~> 0.24, >= 0.23.0)
-      thor (~> 0.19.0)
-    pronto-eslint (0.9.1)
-      eslintrb (~> 2.0, >= 2.0.0)
-      pronto (~> 0.9.0)
-    pronto-haml (0.9.0)
-      haml_lint (~> 0.23)
-      pronto (~> 0.9.0)
-    pronto-rubocop (0.9.1)
-      pronto (~> 0.9.0)
-      rubocop (~> 0.50, >= 0.49.1)
-    pronto-scss (0.9.1)
-      pronto (~> 0.9.0)
-      scss_lint (~> 0.43, >= 0.43.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    public_suffix (3.0.3)
-    raabro (1.1.6)
-    rack (2.0.6)
-    rack-cors (1.0.2)
-    rack-google-analytics (1.2.0)
-      actionpack
-      activesupport
-    rack-mobile-detect (0.4.0)
-      rack
-    rack-oauth2 (1.9.3)
-      activesupport
-      attr_required
-      httpclient
-      json-jwt (>= 1.9.0)
-      rack
-    rack-piwik (0.3.0)
-    rack-protection (2.0.4)
-      rack
-    rack-rewrite (1.5.1)
-    rack-ssl (1.4.1)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.1.6)
-      actioncable (= 5.1.6)
-      actionmailer (= 5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
-      activemodel (= 5.1.6)
-      activerecord (= 5.1.6)
-      activesupport (= 5.1.6)
-      bundler (>= 1.3.0)
-      railties (= 5.1.6)
-      sprockets-rails (>= 2.0.0)
-    rails-assets-autosize (4.0.2)
-    rails-assets-backbone (1.3.3)
-      rails-assets-underscore (>= 1.8.3)
-    rails-assets-blueimp-gallery (2.33.0)
-    rails-assets-bootstrap (3.3.7)
-      rails-assets-jquery (>= 1.9.1, < 4)
-    rails-assets-bootstrap-markdown (2.10.0)
-      rails-assets-bootstrap (~> 3)
-    rails-assets-corejs-typeahead (1.2.1)
-      rails-assets-jquery (>= 1.11)
-    rails-assets-diaspora_jsxc (0.1.5.develop.7)
-      rails-assets-emojione (~> 2.0.1)
-      rails-assets-favico.js (>= 0.3.10, < 0.4)
-      rails-assets-jquery-colorbox (~> 1.6.3)
-      rails-assets-jquery-fullscreen-plugin (~> 0.5.0)
-      rails-assets-jquery.slimscroll (~> 1.3.6)
-      rails-assets-jquery.ui (~> 1.11.4)
-    rails-assets-emojione (2.0.1)
-    rails-assets-favico.js (0.3.10)
-    rails-assets-fine-uploader (5.13.0)
-    rails-assets-highlightjs (9.12.0)
-    rails-assets-jasmine (3.3.0)
-    rails-assets-jasmine-ajax (3.4.0)
-      rails-assets-jasmine (~> 3)
-    rails-assets-jquery (3.3.1)
-    rails-assets-jquery-colorbox (1.6.4)
-      rails-assets-jquery (>= 1.3.2)
-    rails-assets-jquery-fullscreen-plugin (0.5.0)
-    rails-assets-jquery-placeholder (2.3.1)
-      rails-assets-jquery (>= 1.6)
-    rails-assets-jquery-textchange (0.2.3)
-      rails-assets-jquery
-    rails-assets-jquery.are-you-sure (1.9.0)
-      rails-assets-jquery (>= 1.4.2)
-    rails-assets-jquery.slimscroll (1.3.8)
-    rails-assets-jquery.ui (1.11.4)
-      rails-assets-jquery (>= 1.6)
-    rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
-    rails-assets-markdown-it (8.4.2)
-    rails-assets-markdown-it-diaspora-mention (1.2.0)
-    rails-assets-markdown-it-hashtag (0.4.0)
-    rails-assets-markdown-it-sanitizer (0.4.3)
-    rails-assets-markdown-it-sub (1.0.0)
-    rails-assets-markdown-it-sup (1.0.0)
-    rails-assets-underscore (1.9.1)
-    rails-assets-utatti-perfect-scrollbar (1.4.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.2)
-      i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
-    rails-timeago (2.16.0)
-      actionpack (>= 3.1)
-      activesupport (>= 3.1)
-    railties (5.1.6)
-      actionpack (= 5.1.6)
-      activesupport (= 5.1.6)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    raindrops (0.19.0)
-    rake (12.3.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    redcarpet (3.4.0)
-    redis (3.3.5)
-    regexp_parser (1.3.0)
-    request_store (1.4.1)
-      rack (>= 1.4)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-json_expectations (2.1.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.60.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-oembed (0.12.0)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
-    rubyzip (1.2.2)
-    rugged (0.27.5)
-    safe_yaml (1.0.4)
-    sass (3.4.25)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    scss_lint (0.55.0)
-      rake (>= 0.9, < 13)
-      sass (~> 3.4.20)
-    secure_headers (6.0.0)
-    shellany (0.0.1)
-    shoulda-matchers (3.1.2)
-      activesupport (>= 4.0.0)
-    sidekiq (5.2.3)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    sidekiq-cron (1.0.4)
-      fugit (~> 1.1)
-      sidekiq (>= 4.2.1)
-    simple_captcha2 (0.4.3)
-      rails (>= 4.1)
-    simple_oauth (0.3.1)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sinon-rails (1.15.0)
-      railties (>= 3.1)
-    spring (2.0.2)
-      activesupport (>= 4.2)
-    spring-commands-cucumber (1.0.1)
-      spring (>= 0.9.1)
-    spring-commands-rspec (1.0.4)
-      spring (>= 0.9.1)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    state_machines (0.5.0)
-    string-direction (1.2.1)
-    swd (1.1.2)
-      activesupport (>= 3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
-    sysexits (1.2.0)
-    systemu (2.6.5)
-    temple (0.8.0)
-    term-ansicolor (1.7.0)
-      tins (~> 1.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tilt (2.0.8)
-    timecop (0.9.1)
-    timers (4.2.0)
-    tins (1.20.2)
-    to_regexp (0.2.1)
-    turbo_dev_assets (0.0.2)
-    twitter (6.2.0)
-      addressable (~> 2.3)
-      buftok (~> 0.2.0)
-      equalizer (~> 0.0.11)
-      http (~> 3.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
-      memoizable (~> 0.4.0)
-      multipart-post (~> 2.0)
-      naught (~> 1.0)
-      simple_oauth (~> 0.3.0)
-    twitter-text (1.14.7)
-      unf (~> 0.1.0)
-    typhoeus (1.3.1)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    uglifier (4.1.19)
-      execjs (>= 0.3.0, < 3)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
-    unicorn (5.4.1)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
-    unicorn-worker-killer (0.4.4)
-      get_process_mem (~> 0)
-      unicorn (>= 4, < 6)
-    uuid (2.3.9)
-      macaddr (~> 1.0)
-    valid (1.2.0)
-    validate_email (0.1.6)
-      activemodel (>= 3.0)
-      mail (>= 2.2.5)
-    validate_url (1.0.2)
-      activemodel (>= 3.0.0)
-      addressable
-    versionist (1.7.0)
-      activesupport (>= 3)
-      railties (>= 3)
-      yard (~> 0.9.11)
-    warden (1.2.8)
-      rack (>= 2.0.6)
-    webfinger (1.1.0)
-      activesupport
-      httpclient (>= 2.4)
-    webmock (3.4.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    will_paginate (3.1.6)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-    yard (0.9.16)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_model_serializers (= 0.9.7)
-  activerecord-import (= 0.27.0)
-  acts-as-taggable-on (= 6.0.0)
-  acts_as_api (= 1.0.1)
-  addressable (= 2.5.2)
-  asset_sync (= 2.5.0)
-  autoprefixer-rails (= 8.6.5)
-  bootstrap-sass (= 3.3.7)
-  bootstrap-switch-rails (= 3.3.4)
-  capybara (= 3.11.1)
-  carrierwave (= 1.2.3)
-  compass-rails (= 3.1.0)
-  configurate (= 0.3.1)
-  coveralls (= 0.8.22)
-  cucumber-api-steps (= 0.14)
-  cucumber-rails (= 1.6.0)
-  database_cleaner (= 1.7.0)
-  devise (= 4.5.0)
-  devise_lastseenable (= 0.0.6)
-  diaspora-prosody-config (= 0.0.7)
-  diaspora_federation-json_schema (= 0.2.5)
-  diaspora_federation-rails (= 0.2.5)
-  diaspora_federation-test (= 0.2.5)
-  entypo-rails (= 3.0.0)
-  eye (= 0.10.0)
-  factory_girl_rails (= 4.8.0)
-  faraday (= 0.15.3)
-  faraday-cookie_jar (= 0.0.6)
-  faraday_middleware (= 0.12.2)
-  fixture_builder (= 0.5.2.rc3)
-  fog-aws (= 3.3.0)
-  fuubar (= 2.3.2)
-  gon (= 6.2.1)
-  guard (= 2.15.0)
-  guard-rspec (= 4.7.3)
-  guard-rubocop (= 1.3.0)
-  haml_lint (= 0.28.0)
-  hamlit (= 2.9.1)
-  handlebars_assets (= 0.23.2)
-  http_accept_language (= 2.1.1)
-  i18n-inflector-rails (= 1.0.7)
-  jasmine (= 3.3.0)
-  jasmine-jquery-rails (= 2.0.3)
-  jquery-rails (= 4.3.3)
-  js-routes (= 1.4.4)
-  js_image_paths (= 0.1.1)
-  json (= 2.1.0)
-  json-schema (= 2.8.1)
-  json-schema-rspec (= 0.0.4)
-  leaflet-rails (= 1.3.1)
-  logging-rails (= 0.6.0)
-  markdown-it-html5-embed (= 1.0.0)
-  markerb (= 1.1.0)
-  mini_magick (= 4.9.2)
-  minitest
-  mobile-fu (= 1.4.0)
-  mysql2 (= 0.5.2)
-  net-ldap (~> 0.16)
-  nokogiri (= 1.8.5)
-  omniauth (= 1.8.1)
-  omniauth-tumblr (= 1.2)
-  omniauth-twitter (= 1.4.0)
-  omniauth-wordpress (= 0.2.2)
-  open_graph_reader (= 0.6.2)
-  openid_connect (= 1.1.6)
-  pg (= 1.1.3)
-  poltergeist (= 1.18.1)
-  pronto (= 0.9.5)
-  pronto-eslint (= 0.9.1)
-  pronto-haml (= 0.9.0)
-  pronto-rubocop (= 0.9.1)
-  pronto-scss (= 0.9.1)
-  pry
-  pry-byebug
-  rack-cors (= 1.0.2)
-  rack-google-analytics (= 1.2.0)
-  rack-piwik (= 0.3.0)
-  rack-rewrite (= 1.5.1)
-  rack-ssl (= 1.4.1)
-  rails (= 5.1.6)
-  rails-assets-autosize (= 4.0.2)!
-  rails-assets-backbone (= 1.3.3)!
-  rails-assets-blueimp-gallery (= 2.33.0)!
-  rails-assets-bootstrap-markdown (= 2.10.0)!
-  rails-assets-corejs-typeahead (= 1.2.1)!
-  rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!
-  rails-assets-fine-uploader (= 5.13.0)!
-  rails-assets-highlightjs (= 9.12.0)!
-  rails-assets-jasmine-ajax (= 3.4.0)!
-  rails-assets-jquery (= 3.3.1)!
-  rails-assets-jquery-placeholder (= 2.3.1)!
-  rails-assets-jquery-textchange (= 0.2.3)!
-  rails-assets-jquery.are-you-sure (= 1.9.0)!
-  rails-assets-jquery.ui (= 1.11.4)!
-  rails-assets-markdown-it (= 8.4.2)!
-  rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
-  rails-assets-markdown-it-diaspora-mention (= 1.2.0)!
-  rails-assets-markdown-it-hashtag (= 0.4.0)!
-  rails-assets-markdown-it-sanitizer (= 0.4.3)!
-  rails-assets-markdown-it-sub (= 1.0.0)!
-  rails-assets-markdown-it-sup (= 1.0.0)!
-  rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
-  rails-controller-testing (= 1.0.2)
-  rails-i18n (= 5.1.2)
-  rails-timeago (= 2.16.0)
-  rb-fsevent (= 0.10.3)
-  rb-inotify (= 0.9.10)
-  redcarpet (= 3.4.0)
-  redis (= 3.3.5)
-  responders (= 2.4.0)
-  rspec-json_expectations (~> 2.1)
-  rspec-rails (= 3.8.1)
-  rubocop (= 0.60.0)
-  ruby-oembed (= 0.12.0)
-  rubyzip (= 1.2.2)
-  sass-rails (= 5.0.7)
-  secure_headers (= 6.0.0)
-  shoulda-matchers (= 3.1.2)
-  sidekiq (= 5.2.3)
-  sidekiq-cron (= 1.0.4)
-  simple_captcha2 (= 0.4.3)
-  simplecov (= 0.16.1)
-  sinon-rails (= 1.15.0)
-  spring (= 2.0.2)
-  spring-commands-cucumber (= 1.0.1)
-  spring-commands-rspec (= 1.0.4)
-  sprockets-rails (= 3.2.1)
-  string-direction (= 1.2.1)
-  timecop (= 0.9.1)
-  turbo_dev_assets (= 0.0.2)
-  twitter (= 6.2.0)
-  twitter-text (= 1.14.7)
-  typhoeus (= 1.3.1)
-  uglifier (= 4.1.19)
-  unicorn (= 5.4.1)
-  unicorn-worker-killer (= 0.4.4)
-  uuid (= 2.3.9)
-  versionist (= 1.7.0)
-  webmock (= 3.4.2)
-  will_paginate (= 3.1.6)
-
-BUNDLED WITH
-   1.17.1
diff --git a/nixops/modules/websites/tools/diaspora/diaspora.json b/nixops/modules/websites/tools/diaspora/diaspora.json
index d5891c1..e6795aa 100644
--- a/nixops/modules/websites/tools/diaspora/diaspora.json
+++ b/nixops/modules/websites/tools/diaspora/diaspora.json
@@ -1,15 +1,15 @@
 {
-  "tag": "v0.7.8.0",
+  "tag": "v0.7.10.0",
   "meta": {
     "name": "diaspora",
     "url": "https://github.com/diaspora/diaspora",
-    "branch": "refs/tags/v0.7.8.0"
+    "branch": "refs/tags/v0.7.10.0"
   },
   "github": {
     "owner": "diaspora",
     "repo": "diaspora",
-    "rev": "e1b66f3c7cb72bd2cc9cf51475b31b005a547556",
-    "sha256": "1cgyb878zhdnkh7qa9qj8lwaf0jlb1prg1qnqasf7j5kgh9wn0nn",
+    "rev": "f0085cf5bb1c45bdfba866f628153d299e56eca8",
+    "sha256": "02mnb40rdkk6jlnvpy61fad59gbpgnlwz1k35w4wfqdwzq0znaqp",
     "fetchSubmodules": true
   }
 }
diff --git a/nixops/modules/websites/tools/diaspora/diaspora.nix b/nixops/modules/websites/tools/diaspora/diaspora.nix
index 778fe26..616c5cc 100644
--- a/nixops/modules/websites/tools/diaspora/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora/diaspora.nix
@@ -1,25 +1,31 @@
 { env, fetchedGithub, stdenv, defaultGemConfig, writeText, bundlerEnv, ruby_2_4, pkgs, cacert }:
 let
-  gems = bundlerEnv {
-    name = "diaspora-env";
-    ruby = ruby_2_4;
-    gemdir = ./.;
-    gemConfig = defaultGemConfig // {
-      kostya-sigar = attrs: {
-        buildInputs = with pkgs; [ pkgs.perl ];
-      };
-    };
-  };
   varDir = "/var/lib/diaspora_immae";
   socketsDir = "/run/diaspora";
   diaspora = stdenv.mkDerivation (fetchedGithub ./diaspora.json // rec {
     buildPhase = ''
       patch -p1 < ${./ldap.patch}
+      # FIXME: bundlerEnv below doesn't take postgresql group for some
+      # reason
+      echo 'gem "pg",     "1.1.3"' >> Gemfile
     '';
     installPhase = ''
       cp -a . $out
     '';
   });
+  gems = bundlerEnv {
+    name = "diaspora-env";
+    ruby = ruby_2_4;
+    gemfile = "${diaspora}/Gemfile";
+    lockfile = "${diaspora}/Gemfile.lock";
+    gemset = ./gemset.nix;
+    groups = [ "postgresql" "default" "production" ];
+    gemConfig = defaultGemConfig // {
+      kostya-sigar = attrs: {
+        buildInputs = [ pkgs.perl ];
+      };
+    };
+  };
   secret_token = writeText "secret_token.rb" ''
     Diaspora::Application.config.secret_key_base = '${env.secret_token}'
     '';
diff --git a/nixops/modules/websites/tools/diaspora/gemset.nix b/nixops/modules/websites/tools/diaspora/gemset.nix
index 66482f0..f946088 100644
--- a/nixops/modules/websites/tools/diaspora/gemset.nix
+++ b/nixops/modules/websites/tools/diaspora/gemset.nix
@@ -223,13 +223,14 @@
     version = "3.3.7";
   };
   bootstrap-switch-rails = {
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qdk7xx0zlv4l49s2mwg4jd8a5ms3cy43n9l3217bknagcjyjfjx";
+      sha256 = "1zkwc1hfmihnm0n9lkva5zk0cmqpfcpnrwnmaniyvgx7rac2r14l";
       type = "gem";
     };
-    version = "3.3.4";
+    version = "3.3.3";
   };
   buftok = {
     platforms = [];
@@ -1495,6 +1496,16 @@
     };
     version = "2.0.0";
   };
+  mysql2 = {
+    groups = ["mysql"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
   naught = {
     platforms = [];
     source = {
@@ -3042,4 +3053,4 @@
     };
     version = "0.9.16";
   };
-}
+}
\ No newline at end of file