Move configuration to a local-config project

5 files changed, 10 insertions, 4 deletions

diff --git a/bins/trove-early-setup b/bins/trove-early-setup
index 095def8..36d8e9a 100755
--- a/bins/trove-early-setup
+++ b/bins/trove-early-setup
@@ -70,9 +70,9 @@ lorry-controller-configured: /home/lorry/.lorry-controller-setup
 /home/lorry/.lorry-controller-setup: /home/lorry/.lorry-setup /home/git/.gitano-lorry-setup
 	PREFIX=$$(echo "##PREFIX##" | sed -f /etc/trove-setup.sed); \
 	su -c "ssh localhost create $${PREFIX}/lorries" - git; \
-	su -c "git clone ssh://localhost/$${PREFIX}/lorries.git /tmp/lorries" - git; \
+	su -c "git clone ssh://localhost/$${PREFIX}/local-config/lorries.git /tmp/lorries" - git; \
 	su -c "mkdir /home/lorry/lorry-controller-area" - lorry; \
-	su -c "git clone ssh://git@localhost/$${PREFIX}/lorries.git /home/lorry/lorry-controller-area/git" - lorry
+	su -c "git clone ssh://git@localhost/$${PREFIX}/local-config/lorries.git /home/lorry/lorry-controller-area/git" - lorry
 	su -c "sed -f /etc/trove-setup.sed < /usr/share/trove-setup/lorry-controller.conf > /tmp/lorries/lorry-controller.conf" - git
 	su -c "cd /tmp/lorries; git add lorry-controller.conf; git commit -m 'Initial configuration'; git push origin master" - git
 	su -c "rm -rf /tmp/lorries" - git
@@ -92,8 +92,8 @@ cache-configured: cache-setup
 mason-setup: /home/git/.mason-setup
 /home/git/.mason-setup: gitano-configured
 	PREFIX=$$(echo "##PREFIX##" | sed -f /etc/trove-setup.sed); \
-	su -c "ssh localhost create $${PREFIX}/mason-config" - git; \
-	su -c "git clone ssh://localhost/$${PREFIX}/mason-config.git /tmp/mason-config" - git
+	su -c "ssh localhost create $${PREFIX}/local-config/mason" - git; \
+	su -c "git clone ssh://localhost/$${PREFIX}/local-config/mason.git /tmp/mason-config" - git
 	su -c "cd /tmp/mason-config; mkdir ci1; echo '[]' > ci1/systems.json.txt" - git
 	su -c "cd /tmp/mason-config; echo '[]' > ci1/hosts.json.txt" - git
 	su -c "cd /tmp/mason-config; git add ci1; git commit -m 'Set initial Mason config'; git push origin master" - git
diff --git a/gitano-admin/groups/local-config-admins.conf b/gitano-admin/groups/local-config-admins.conf
new file mode 100644
index 0000000..435a297
--- /dev/null
+++ b/gitano-admin/groups/local-config-admins.conf
@@ -0,0 +1 @@
+description "Users who are permitted to administer the local-config project"
diff --git a/gitano-admin/groups/local-config-managers.conf b/gitano-admin/groups/local-config-managers.conf
new file mode 100644
index 0000000..d256c06
--- /dev/null
+++ b/gitano-admin/groups/local-config-managers.conf
@@ -0,0 +1 @@
+description "Users who are permitted to manage the local-config project"
diff --git a/gitano-admin/groups/local-config-readers.conf b/gitano-admin/groups/local-config-readers.conf
new file mode 100644
index 0000000..fdff552
--- /dev/null
+++ b/gitano-admin/groups/local-config-readers.conf
@@ -0,0 +1,3 @@
+description "Users who are permitted to read from the local-config project"
+
+members["*"] "lorry"
diff --git a/gitano-admin/groups/local-config-writers.conf b/gitano-admin/groups/local-config-writers.conf
new file mode 100644
index 0000000..fa5961f
--- /dev/null
+++ b/gitano-admin/groups/local-config-writers.conf
@@ -0,0 +1 @@
+description "Users who are permitted to write to the local-config project"