Map LDAP jpegPhoto to vcard-temp PHOTO

nodes/mastodon-3.json

@@ -37,7 +37,6 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
-      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",

site-cookbooks/kosmos-base/recipes/default.rb

@@ -27,7 +27,6 @@
 include_recipe 'apt'
 include_recipe 'timezone_iii'
 include_recipe 'ntp'
-include_recipe 'kosmos-base::journald_conf'
 include_recipe 'kosmos-base::systemd_emails'
 
 node.override["apt"]["unattended_upgrades"]["allowed_origins"] = [
@@ -38,14 +37,6 @@ node.override["apt"]["unattended_upgrades"]["mail"] = "ops@kosmos.org"
 node.override["apt"]["unattended_upgrades"]["syslog_enable"] = true
 include_recipe 'apt::unattended-upgrades'
 
-node.override["apt"]["unattended_upgrades"]["allowed_origins"] = [
-  "${distro_id}:${distro_codename}-security",
-  "${distro_id}:${distro_codename}-updates"
-]
-node.override["apt"]["unattended_upgrades"]["mail"] = "ops@kosmos.org"
-node.override["apt"]["unattended_upgrades"]["syslog_enable"] = true
-include_recipe 'apt::unattended-upgrades'
-
 package 'mailutils'
 package 'mosh'
 package 'vim'

site-cookbooks/kosmos-ejabberd/recipes/default.rb

@@ -110,7 +110,6 @@ hosts = [
         access_persistent: muc_create
         access_register: muc_create
         max_user_conferences: 1000
-        max_users: 2000
         default_room_options:
           mam: true
         preload_rooms: true

site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb

@@ -185,11 +185,8 @@ api_permissions:
     what:
       - "add_rosteritem"
       - "delete_rosteritem"
-      - "get_vcard2"
-      - "muc_register_nick"
-      - "private_set"
       - "send_message"
-      - "send_stanza"
+      - "private_set"
 
 language: "en"
 
@@ -261,7 +258,10 @@ modules:
         transport: tcp
         restricted: true
   mod_vcard:
+    db_type: ldap
     search: false
+    ldap_vcard_map:
+      PHOTO: {"%s": [jpegPhoto]}
   mod_vcard_xupdate: {}
   mod_avatar: {}
   mod_version: {}

site-cookbooks/kosmos-mastodon/recipes/default.rb

@@ -265,44 +265,6 @@ service "mastodon-streaming" do
   action [:enable, :start]
 end
 
-#
-# Delete cached remote media older than 30 days
-# Will be re-fetched if necessary
-#
-
-systemd_unit 'mastodon-delete-old-media-cache.service' do
-  content({
-    Unit: {
-      Description: 'Delete old Mastodon media cache'
-    },
-    Service: {
-      Type: "oneshot",
-      WorkingDirectory: mastodon_path,
-      Environment: "RAILS_ENV=#{rails_env}",
-      ExecStart: "#{bundle_path} exec bin/tootctl media remove --days 30",
-    }
-  })
-  triggers_reload true
-  action [:create]
-end
-
-systemd_unit 'mastodon-delete-old-media-cache.timer' do
-  content({
-    Unit: {
-      Description: 'Delete old Mastodon media cache'
-    },
-    Timer: {
-      OnCalendar: '*-*-* 00:00:00',
-      Persistent: 'true'
-    },
-    Install: {
-      WantedBy: 'timer.target'
-    }
-  })
-  triggers_reload true
-  action [:create, :enable, :start]
-end
-
 firewall_rule "mastodon_app" do
   port     node['kosmos-mastodon']['app_port']
   source   "10.1.1.0/24"