(hopefully) fix that bundler mess

roles/schleuder/defaults/main.yml

@@ -67,7 +67,7 @@ schleuder_defaults_forward_all_incoming_to_admins: false
 
 
 # This is the last commit before schleuder 3.5 was required
-schleuder_web_commitish: 7bf1b2f39d15bf05c3eb198c5b0f6dfea97b0cee
+schleuder_web_commitish: main
 schleuder_web_hostname: schleuder.example.org
 schleuder_web_mailfrom: noreply@schleuder.example.org
 schleuder_web_delivery_method: sendmail

roles/schleuder/tasks/install_web.yml

@@ -51,12 +51,20 @@
 - name: render /var/lib/schleuder-web/schleuder-web.yml
   template:
     src: var/lib/schleuder-web/schleuder-web.yml.j2
-    dest: /var/lib/schleuder-web/schleuder-web
+    dest: /var/lib/schleuder-web/schleuder-web.yml
     owner: schleuder-web
     group: root
     mode: 0600
   notify: systemctl restart schleuder-web
 
+- name: render /var/lib/schleuder-web/schleuder-web/config/database.yml
+  template:
+    src: var/lib/schleuder-web/schleuder-web/config/database.yml.j2
+    dest: /var/lib/schleuder-web/schleuder-web/config/database.yml
+    owner: schleuder-web
+    group: nogroup
+    mode: 0644
+
 - name: get schleuder api tls fingerprint
   community.crypto.x509_certificate_info:
     path: /etc/schleuder/schleuder-certificate.pem
@@ -82,18 +90,11 @@
     mode: 0644
   notify: systemctl daemon-reload
 
-- name: install correct bundler version
+- name: run bundle install ... this may take a few minutes
   become: yes
   become_user: schleuder-web
   command:
-    cmd: /usr/bin/bundle update --bundler
-    chdir: /var/lib/schleuder-web/schleuder-web
-
-- name: run bundle install
-  become: yes
-  become_user: schleuder-web
-  command:
-    cmd: /usr/bin/bundle install --without deployment
+    cmd: /usr/bin/bundle install --path /var/lib/schleuder-web/.gem --without deployment
     chdir: /var/lib/schleuder-web/schleuder-web
 
 - name: run bundle db setup

roles/schleuder/templates/var/lib/schleuder-web/schleuder-web/config/database.yml.j2

@@ -0,0 +1,23 @@
+{{ ansible_managed | comment }}
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+development:
+  <<: *default
+  database: db/development.sqlite3
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: db/test.sqlite3
+production:
+  <<: *default
+  database: /var/lib/schleuder-web/schleuder-web.sqlite3