From 5b0245acc1b5b1c520db847d70b1b81bafb4d0c2 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 17 Jun 2014 09:16:20 +0000 Subject: Remove old scripts and units --- Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3a64344..ba0b752 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,6 @@ install: ln -s /home/lorry/tarballs "${DESTDIR}/var/www/htdocs/tarballs" ln -s /home/lorry/lc-status.html "${DESTDIR}/var/www/htdocs/lc-status.html" ln -s /usr/share/lorry-controller/static/ "${DESTDIR}/var/www/htdocs/lc-static" - mkdir -p "${DESTDIR}/usr/bin" - cp bins/* "${DESTDIR}/usr/bin/" - mkdir -p "${DESTDIR}/usr/libexec" - cp libexecs/* "${DESTDIR}/usr/libexec/" mkdir -p "${DESTDIR}/usr/share/trove-setup" cp -r share/* "${DESTDIR}/usr/share/trove-setup/" -- cgit v1.2.1 From 54e3fbd49d10b70d04e03a646a494ec29a49ffc3 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 17 Jun 2014 10:06:13 +0000 Subject: Move gitano skeleton to /usr/share/trove-setup/ --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ba0b752..0559468 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,4 @@ install: - mkdir -p "${DESTDIR}/usr/share/gitano/skel" - cp -a gitano-admin "${DESTDIR}/usr/share/gitano/skel" mkdir -p "${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants" cp units/* "${DESTDIR}/usr/lib/systemd/system" for I in $$(cd units; ls); do \ -- cgit v1.2.1 From 200ac0a9b1240966465188bb518f592826a301f0 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 27 Jun 2014 16:39:10 +0000 Subject: Do not enable the units when installing. They aren't eligible to be started until they are configured, and Ansible handles both the initial start, and configuring them to start automatically on next boot. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0559468..52e3106 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ install: mkdir -p "${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants" cp units/* "${DESTDIR}/usr/lib/systemd/system" - for I in $$(cd units; ls); do \ - ln -sf ../$$I "${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/$$I"; \ - done + ln -sf ../trove-setup.service "${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/trove-setup.service" cp -r etc "${DESTDIR}" mkdir -p "${DESTDIR}/var/www/htdocs" cp http-assets/* "${DESTDIR}/var/www/htdocs" -- cgit v1.2.1 From 24cad9837ea25784243e0c485b9fe954f9a8a5a8 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 18 Jun 2014 11:53:27 +0000 Subject: Install Ansible scripts and create a unit to run them --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 52e3106..134436b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ install: + mkdir -p "${DESTDIR}/usr/lib/trove-setup/ansible" + cp -r ansible/* "${DESTDIR}/usr/lib/trove-setup/ansible" mkdir -p "${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants" cp units/* "${DESTDIR}/usr/lib/systemd/system" ln -sf ../trove-setup.service "${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/trove-setup.service" -- cgit v1.2.1