From c2d647a3cb3a6d456684bcdce327954214352959 Mon Sep 17 00:00:00 2001 From: Sacha Chua Date: Tue, 8 Nov 2022 12:00:47 -0500 Subject: Update edit and publish configs, tweak OBS, add Mumble client --- roles/publish/templates/emacsconf-config.el | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'roles/publish/templates/emacsconf-config.el') diff --git a/roles/publish/templates/emacsconf-config.el b/roles/publish/templates/emacsconf-config.el index 36ca8a2..fbd9ae7 100644 --- a/roles/publish/templates/emacsconf-config.el +++ b/roles/publish/templates/emacsconf-config.el @@ -20,27 +20,31 @@ (setq emacsconf-backstage-dir "/ssh:orga@media.emacsconf.org:/var/www/media.emacsconf.org/2022/backstage") (setq emacsconf-upload-dir "/ssh:orga@media.emacsconf.org:/srv/upload") + {% if ansible_host == "res.emacsconf.org" %} -(setq emacsconf-res-dir (format "/ssh:orga@res.emacsconf.org:/data/emacsconf/%s" emacsconf-year)) +(setq emacsconf-res-dir "/data/{{ emacsconf_id }}/{{ emacsconf_year}}") (setq emacsconf-cache-dir "/data/{{ emacsconf_id }}/cache") (setq emacsconf-stream-host "localhost") +(setq emacsconf-stream-overlay-dir "/data/emacsconf/overlays") +(setq emacsconf-stream-asset-dir "/data/emacsconf/assets") {% else %} -(setq emacsconf-res-dir "/data/{{ emacsconf_id }}/{{ emacsconf_year}}") +(setq emacsconf-res-dir (format "/ssh:orga@res.emacsconf.org:/data/emacsconf/%s" emacsconf-year)) {% endif %} + (add-to-list 'load-path "~/compile-media") +(add-to-list 'load-path "~/subed/subed") (require 'compile-media) (require 'emacsconf) (require 'emacsconf-publish) (require 'emacsconf-schedule) (require 'emacsconf-erc) (require 'emacsconf-stream) - +(require 'subed) +(require 'subed-vtt) +(require 'subed-common) (setq emacsconf-tracks '((:name "General" :color "peachpuff" :id "gen" :channel "emacsconf-gen" - :tramp "/ssh:gen:") + :tramp "/ssh:emacsconf-gen@res.emacsconf.org#46668:") (:name "Development" :color "skyblue" :id "dev" :channel "emacsconf-dev" - :tramp "/ssh:dev:"))) -(setq emacsconf-stream-overlay-dir - (expand-file-name "overlays" (file-name-directory emacsconf-org-file))) -(setq emacsconf-stream-asset-dir - (expand-file-name "assets" (file-name-directory emacsconf-org-file))) + :tramp "/ssh:emacsconf-dev@res.emacsconf.org#46668:"))) + -- cgit v1.2.3