From 43285028a82816a86e0d983a90b4204fa1df68e8 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Thu, 24 Mar 2016 10:20:38 +0000
Subject: [PATCH] fix small issues
---
INSTALL.md | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/INSTALL.md b/INSTALL.md
index 687219b..732406e 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -65,8 +65,8 @@ coreos:
Type=oneshot
RemainAfterExit=true
ExecStartPre=-/bin/bash -euxc ' \
- fallocate -l 8192m /swap \
- chmod 600 /swap \
+ fallocate -l 8192m /swap &&\
+ chmod 600 /swap &&\
mkswap /swap'
ExecStart=/sbin/swapon /swap
ExecStop=/sbin/swapoff /swap
@@ -75,27 +75,28 @@ coreos:
- name: install-compose.service
command: start
content: |
- [unit]
+ [Unit]
Description=Install Docker Compose
[Service]
Type=oneshot
RemainAfterExit=true
ExecStart=-/bin/bash -euxc ' \
- mkdir -p /opt/bin \
- curl -L `curl -s https://api.github.com/repos/docker/compose/releases/latest | jq -r '.assets[].browser_download_url | select(contains("Linux") and contains("x86_64"))'` > /opt/bin/docker-compose \
+ mkdir -p /opt/bin &&\
+ url=$(curl -s https://api.github.com/repos/docker/compose/releases/latest | jq -r \'.assets[].browser_download_url | select(contains("Linux") and contains("x86_64"))\') &&\
+ curl -L $url > /opt/bin/docker-compose &&\
chmod +x /opt/bin/docker-compose'
- name: install-indiehosters.service
command: start
content: |
- [unit]
+ [Unit]
Description=Install IndieHosters
[Service]
Type=oneshot
RemainAfterExit=true
ExecStart=-/bin/bash -euxc ' \
- git clone https://github.com/indiehosters/LibrePaaS.git /indiehosters \
- mkdir /{data,system} \
- mkdir /data/trash \
- cp /indiehosters/unit-files/* /etc/systemd/system && systemctl daemon-reload \
+ git clone https://github.com/indiehosters/LibrePaaS.git /indiehosters &&\
+ mkdir /{data,system} &&\
+ mkdir /data/trash &&\
+ cp /indiehosters/unit-files/* /etc/systemd/system && systemctl daemon-reload &&\
cp /indiehosters/utils/* /opt/bin/'
```
--
GitLab