diff options
Diffstat (limited to 'roles/publish')
| -rw-r--r-- | roles/publish/tasks/main.yml | 17 | ||||
| -rw-r--r-- | roles/publish/templates/emacsconf-config.el | 5 |
2 files changed, 7 insertions, 15 deletions
diff --git a/roles/publish/tasks/main.yml b/roles/publish/tasks/main.yml index ddee975..128b0fa 100644 --- a/roles/publish/tasks/main.yml +++ b/roles/publish/tasks/main.yml @@ -9,19 +9,6 @@ owner: "{{ emacsconf_user }}" group: "{{ emacsconf_group }}" mode: '0600' -- name: Check SSH config for line - blockinfile: - path: /home/{{ emacsconf_user }}/.ssh/config - mode: '0600' - owner: "{{ emacsconf_user }}" - group: "{{ emacsconf_group }}" - create: yes - block: | - Host anon-emacsconf - Hostname git.emacsconf.org - Port 22 - User anon - IdentityFile ~/.ssh/id_rsa_anon_git_emacsconf - name: Install the SSH key for orga copy: src: "{{ item }}" @@ -78,8 +65,9 @@ block: - name: Check out wiki repository ansible.builtin.git: - repo: git@anon-emacsconf:/emacsconf-wiki + repo: anon@git.emacsconf.org:/emacsconf-wiki dest: "{{ emacsconf_edit_wiki_dir }}" + ssh_opts: "-i ~/.ssh/id_rsa_anon_git_emacsconf -u anon" key_file: "~{{ emacsconf_user }}/.ssh/id_rsa_anon_git_emacsconf" register: wiki_clone failed_when: @@ -91,6 +79,7 @@ args: chdir: "{{ emacsconf_edit_wiki_dir }}" - name: Check out emacsconf-el + tags: wip ansible.builtin.git: repo: git@git.emacsconf.org:pub/emacsconf-el key_file: "~{{ emacsconf_user }}/.ssh/id_rsa" diff --git a/roles/publish/templates/emacsconf-config.el b/roles/publish/templates/emacsconf-config.el index e9e4fcc..36ca8a2 100644 --- a/roles/publish/templates/emacsconf-config.el +++ b/roles/publish/templates/emacsconf-config.el @@ -40,4 +40,7 @@ :tramp "/ssh:gen:") (: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))) |