Sync 18.1 patch

changelog

@@ -1,20 +1,14 @@
 turnkey-canvas-18.1 (1) turnkey; urgency=low
 
-  * Install latest Canvas LTS stable (prod branch), Canvas RCE API and required
-    dependencies. Canvas installed from upstream git repo.
+  * Update to Canvas security.yml config:
+    - delayed_jobs.yml - bump worker_max_memory_usage memory allowance
+      - closes #1979.
+    - security.yml - set domain for lti_iss - untracked bug.
 
-  * Update Ruby (3.1.6).
+  * Disable Apache mod_evasive for Canvas - part of #1965.
 
-  * Update bundler to 2.5.10 - as per "Production Start" doc.
-
-  * Disable Apache mod_evasie for Canvas - part of #1965.
-
-  * Run switchman_inst_jobs:install:migrations - closes #1965.
-
-  * Update GEM_PATH in Apache conf - didn't seem to be causing issues, but
-    better for it to be correct path.
-
-  * Apply fix so passenger-status works - useful for debugging.
+  * Disable Apache PrivateTmp so passenger error files can be found where
+    passenger reports they can be found (i.e. /tmp) - untracked bug.
 
   * Configuration console (confconsole) - v2.1.6:
     - Let's Encrypt/Dehydrated - bugfix cron failure - closes #1962.
@@ -26,7 +20,7 @@ turnkey-canvas-18.1 (1) turnkey; urgency=low
 
   * Reduce log noise by creating ntpsec log dir - closes #1952.
 
- -- Jeremy Davis <[email protected]>  Sat, 06 Jul 2024 11:31:36 +0000
+ -- Jeremy Davis <[email protected]>  Thu, 12 Sep 2024 07:35:16 +0000
 
 turnkey-canvas-18.0 (1) turnkey; urgency=low
 
@@ -204,7 +198,7 @@ turnkey-canvas-16.0 (1) turnkey; urgency=low
   * Repaired Canvas RCE API service for running with a domain.
 
   * Update included NodeJS to 10.x (10.20.1).
-      
+
   * Note: Please refer to turnkey-core's changelog for changes common to all
     appliances. Here we only describe changes specific to this appliance.
 
@@ -217,7 +211,7 @@ turnkey-canvas-15.3 (1) turnkey; urgency=low
   * Include Canvas RCE API service run with Passenger - closes #1319.
 
   * Update included NodeJS to 10.x (10.15.3).
-  
+
   * Note: Please refer to turnkey-core's changelog for changes common to all
     appliances. Here we only describe changes specific to this appliance.
 
@@ -231,7 +225,7 @@ turnkey-canvas-15.2 (1) turnkey; urgency=low
 
   * Include Canvas logrotate.d script - closes #1279.
     [ Zhenya Hvorostian ]
-  
+
   * Note: Please refer to turnkey-core's changelog for changes common to all
     appliances. Here we only describe changes specific to this appliance.
 
@@ -240,27 +234,27 @@ turnkey-canvas-15.2 (1) turnkey; urgency=low
 turnkey-canvas-15.1 (1) turnkey; urgency=low
 
   * Install latest Canvas LTS stable from upstream git repo.
-  
+
   * Update yarn version to 1.10.1.
 
   * Secure yarn apt repo.
-  
+
   * Note: Please refer to turnkey-core's changelog for changes common to all
     appliances. Here we only describe changes specific to this appliance.
-  
+
  -- Zhenya Hvorostian <[email protected]>  Fri, 23 Nov 2018 11:48:21 +0300
 
 turnkey-canvas-15.0 (1) turnkey; urgency=low
 
   * Install latest Canvas LTS stable from upstream git repo.
-  
+
   * Update yarn version to latest.
-  
+
   * Change Node.js version to 8.12.0.
 
   * Note: Please refer to turnkey-core's changelog for changes common to all
     appliances. Here we only describe changes specific to this appliance.
-  
+
  -- Zhenya Hvorostian <[email protected]> Sun, 24 Sep 2018 21:33:10 +0300
 
 turnkey-canvas-14.2 (1) turnkey; urgency=low
@@ -343,7 +337,7 @@ turnkey-canvas-12.1 (1) turnkey; urgency=low
 
   * Canvas:
 
-    - Upgraded to latest version of Canvas - cloned from upstream git repo 
+    - Upgraded to latest version of Canvas - cloned from upstream git repo
       as recommended providing an easy upgrade path.
     - Fixed automated jobs daemon configuration and enabled (bugfix).
     - Set outgoing mail defaults to tls, disable for local postfix (bugfix).

conf.d/52canvas-configs

@@ -57,7 +57,7 @@ production:
 
   max_run_time: 28800
   worker_max_job_count: 20
-  worker_max_memory_usage: 536870912
+  worker_max_memory_usage: 1073741824
 
 default:
   workers:
@@ -78,7 +78,7 @@ cat >$WEBROOT/config/security.yml<<EOF
 production: &default
   # replace this with a random string of at least 20 characters
   encryption_key: 1234512345123451234512345123451234512345123451234512345
-  lti_iss: 'https://canvas.instructure.com'
+  lti_iss: "https://$DOMAIN"
 EOF
 
 cat >$WEBROOT/config/dynamic_settings.yml<<EOF

conf.d/55canvas-install

@@ -69,10 +69,6 @@ bundle exec rake db:initial_setup
 # mv 20210823222355_change_immersive_reader_allowed_on_to_on.rb  db/migrate/
 bundle exec rake db:migrate
 
-# resolve (errant) 'failed to allocate memory' issue - closes
-# https://github.com/turnkeylinux/tracker/issues/1965
-bundle exec rake switchman_inst_jobs:install:migrations
-
 mkdir -p log tmp/pids public/assets 
 
 # stop services

overlay/etc/systemd/system/apache2.service.d/override.conf

@@ -0,0 +1,6 @@
+[Service]
+# Disable Apache private temp so the detailed passenger error html files are
+# saved directly to the root of /tmp - otherwise they are saved to
+# /tmp/systemd-private-xxx.xxx-apache2.service-XXXXXX/tmp/passenger-error-xxxxx.html
+# making them hard to find for the uninitiated
+PrivateTmp=false

overlay/usr/lib/inithooks/bin/canvas.py

@@ -19,18 +19,17 @@
 from libinithooks import inithooks_cache
 from libinithooks.dialog_wrapper import Dialog
 
+DEFAULT_DOMAIN = "www.example.com"
+
 
 def usage(s=None):
     if s:
         print("Error:", s, file=sys.stderr, **kwargs)
-    print("Syntax: %s [options]" % sys.argv[0], file=sys.stderr)
+    print(f"Syntax: {sys.argv[0]} [options]", file=sys.stderr)
     print(__doc__, file=sys.stderr)
     sys.exit(1)
 
 
-DEFAULT_DOMAIN = "www.example.com"
-
-
 def main():
     try:
         opts, args = getopt.gnu_getopt(sys.argv[1:], "h",
@@ -104,25 +103,25 @@ def main():
 
     config = "/var/www/canvas/config/outgoing_mail.yml"
     subprocess.run(["sed", "-ri",
-                    's|domain:.*|domain: "%s"|' % domain,
+                    f's|domain:.*|domain: "{domain}"|',
                     config])
     subprocess.run(["sed", "-ri",
-                    's|outgoing_address:.*|outgoing_address: "%s"|' % email,
+                    f's|outgoing_address:.*|outgoing_address: "{email}"|',
                     config])
 
     config = "/var/www/canvas/config/dynamic_settings.yml"
     subprocess.run(["sed", "-ri",
-                    's|app-host:.*|app-host: "%s:3000"|' % domain,
+                    f's|app-host:.*|app-host: "{domain}:3000"|',
                     config])
 
     config = "/var/www/canvas/config/domain.yml"
     subprocess.run(["sed", "-ri",
-                    's|domain:.*|domain: "%s"|' % domain,
+                    f's|domain:.*|domain: "{domain}"|',
                     config])
 
-    config = "/var/www/canvas/config/initializers/outgoing_mail.rb"
+    config = "/var/www/canvas/config/security.yml"
     subprocess.run(["sed", "-ri",
-                    's|:domain => .*|:domain => "%s",|' % domain,
+                    f's|lti_iss:.*|lti_iss: "https://{domain}"|',
                     config])
 
     print("Restarting services; please wait...")