summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-11-23 11:52:31 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-11-23 12:02:37 +0000
commitc7de0309816af69ddbb753f09df7d5fef5cd8ea3 (patch)
treeedfe8360021f05deedd7cbafcc75887cc3d51ea9
parent8c3bfe80fc76b37bb68b4a047b3400bf0291b12d (diff)
downloadinfrastructure-c7de0309816af69ddbb753f09df7d5fef5cd8ea3.tar.gz
baserock_ostree: Update for changes in BuildStream
BuildStream commit bf8fc373d7711861129 (merge request 158) changes how the SSH protocol works. New versions of BuildStream require these changes to be able to interact with ostree.baserock.org over SSH. Old versions of BuildStream will still be able to interact with it too.
-rw-r--r--baserock_ostree/image-config.yml2
-rw-r--r--baserock_ostree/instance-config.yml8
2 files changed, 5 insertions, 5 deletions
diff --git a/baserock_ostree/image-config.yml b/baserock_ostree/image-config.yml
index 1bfb90df..21c7ba24 100644
--- a/baserock_ostree/image-config.yml
+++ b/baserock_ostree/image-config.yml
@@ -40,7 +40,7 @@
dnf: name=python3-pip state=latest
- name: buildstream sources
- git: dest=/home/fedora/buildstream repo=https://gitlab.com/buildstream/buildstream version=32667b24b801f9b51da026b08e89f7fc55d8ac65
+ git: dest=/home/fedora/buildstream repo=https://gitlab.com/buildstream/buildstream version=bf8fc373d7711861129ab841a74ecf32b3d8b2dd
become_user: fedora
- name: buildstream installed
diff --git a/baserock_ostree/instance-config.yml b/baserock_ostree/instance-config.yml
index 6228d99d..6363500e 100644
--- a/baserock_ostree/instance-config.yml
+++ b/baserock_ostree/instance-config.yml
@@ -51,16 +51,16 @@
- name: sshd configuration for ostree user -- header
lineinfile: state="present" line="Match user ostree" path=/etc/ssh/sshd_config
- name: sshd configuration for ostree user -- force command
- lineinfile: state="present" line=" ForceCommand bst-artifact-receive --verbose /srv/ostree/cache" insertafter="Match user ostree" path=/etc/ssh/sshd_config
+ lineinfile: state="present" line=" ForceCommand bst-artifact-receive --pull-url https://ostree.baserock.org/cache/ --verbose /srv/ostree/cache" insertafter="Match user ostree$" path=/etc/ssh/sshd_config
- name: sshd configuration for ostree user -- disable password auth
- lineinfile: state="present" line=" PasswordAuthentication no" insertafter="Match user ostree" path=/etc/ssh/sshd_config
+ lineinfile: state="present" line=" PasswordAuthentication no" insertafter="Match user ostree$" path=/etc/ssh/sshd_config
- name: sshd configuration for ostree-releases user -- header
lineinfile: state="present" line="Match user ostree-releases" path=/etc/ssh/sshd_config
- name: sshd configuration for ostree-releases user -- force command
- lineinfile: state="present" line=" ForceCommand ostree-receive -v --repo /srv/ostree/releases" insertafter="Match user ostree-releases" path=/etc/ssh/sshd_config
+ lineinfile: state="present" line=" ForceCommand ostree-receive -v --repo /srv/ostree/releases" insertafter="Match user ostree-releases$" path=/etc/ssh/sshd_config
- name: sshd configuration for ostree-releases user -- disable password auth
- lineinfile: state="present" line=" PasswordAuthentication no" insertafter="Match user ostree-releases" path=/etc/ssh/sshd_config
+ lineinfile: state="present" line=" PasswordAuthentication no" insertafter="Match user ostree-releases$" path=/etc/ssh/sshd_config
- name: restart sshd server
service: name=sshd enabled=yes state=restarted