Change placeholders to jinja placeholders

8 files changed, 15 insertions, 15 deletions

diff --git a/share/gitano/skel/gitano-admin/global-hooks/post-receive.lua b/share/gitano/skel/gitano-admin/global-hooks/post-receive.lua
index d1b3864..c7ab051 100644
--- a/share/gitano/skel/gitano-admin/global-hooks/post-receive.lua
+++ b/share/gitano/skel/gitano-admin/global-hooks/post-receive.lua
@@ -14,11 +14,11 @@ local project_hook, repo, updates = ...
 
 local EMPTY_SHA = ("0"):rep(40)
 
-local masonhost = "##MASON_HOST##:##MASON_PORT##"
+local masonhost = "{{ MASON_ID }}:{{ MASON_PORT }}"
 local basepath = "/1.0"
 local urlbases = {
-   "git://##TROVE_HOSTNAME##/",
-   "ssh://git@##TROVE_HOSTNAME##/",
+   "git://{{ TROVE_HOSTNAME }}/",
+   "ssh://git@{{ TROVE_HOSTNAME }}/",
 }
 
 local notify_mason = false
diff --git a/share/gitano/skel/gitano-admin/rules/createrepo.lace b/share/gitano/skel/gitano-admin/rules/createrepo.lace
index bf4683e..a07a744 100644
--- a/share/gitano/skel/gitano-admin/rules/createrepo.lace
+++ b/share/gitano/skel/gitano-admin/rules/createrepo.lace
@@ -11,7 +11,7 @@
 # Administrators have already been permitted whatever they like
 # so this is for site-wide non-admins.
 
-##PEOPLE_COMMENT##allow "Personal repo creation is okay" repo_is_personal
+{{ PEOPLE_COMMENT }}allow "Personal repo creation is okay" repo_is_personal
 
 # Allow people in *-admins to create repositories under <foo>
 allow "Project admins may make project repositories" repo_is_local_project project_admin
diff --git a/share/gitano/skel/gitano-admin/rules/defines.lace b/share/gitano/skel/gitano-admin/rules/defines.lace
index 380948a..466ac6f 100644
--- a/share/gitano/skel/gitano-admin/rules/defines.lace
+++ b/share/gitano/skel/gitano-admin/rules/defines.lace
@@ -83,9 +83,9 @@ define is_admin_ref ref refs/gitano/admin
 #
 #
 
-define repo_is_personal repository ~^##ESC_PERSONAL_PREFIX##/${user}/
-define ref_is_personal ref ~^refs/heads/##ESC_PREFIX##/${user}/
-define repo_is_local_project repository ~^##ESC_PREFIX##/[^/]+/
+define repo_is_personal repository ~^{{ ESC_PERSONAL_PREFIX }}/${user}/
+define ref_is_personal ref ~^refs/heads/{{ ESC_PREFIX }}/${user}/
+define repo_is_local_project repository ~^{{ ESC_PREFIX }}/[^/]+/
 
 define project_reader  group ${repository/2}-readers
 define project_writer  group ${repository/2}-writers
@@ -100,7 +100,7 @@ define trove_site_admin group trove-admin
 define target_group_gitano_admin targetgroup gitano-admin
 
 define is_lorry user lorry
-define is_local_ref ref ~^refs/heads/##ESC_PREFIX##/
+define is_local_ref ref ~^refs/heads/{{ ESC_PREFIX }}/
 define lorryable_repo allof !repo_is_local_project !repo_is_personal !is_admin_repo
 
 define is_worker group workers
diff --git a/share/gitano/skel/gitano-admin/rules/other-project.lace b/share/gitano/skel/gitano-admin/rules/other-project.lace
index 7bc80cc..e5f05be 100644
--- a/share/gitano/skel/gitano-admin/rules/other-project.lace
+++ b/share/gitano/skel/gitano-admin/rules/other-project.lace
@@ -6,7 +6,7 @@
 #
 # Copyright 2012,2013 Codethink Limited
 #
-# Rules for any repository not under ##PREFIX##
+# Rules for any repository not under {{ TROVE_ID }}
 
 # This is, by default, /baserock/ and /delta/
 
@@ -15,11 +15,11 @@ allow "Anyone may read here" op_read
 allow "Anyone may write here" op_write !is_anonymous
 
 # Lorry can do anything reffy which is not inside the local refs
-allow "Lorry may touch everything but refs/heads/##PREFIX##" op_is_reffy is_lorry !is_local_ref
+allow "Lorry may touch everything but refs/heads/{{ TROVE_ID }}" op_is_reffy is_lorry !is_local_ref
 
 # Noone can rewind/rebase outside of their personal refs
 deny "Non-personal branches may not be rewound/rebased" op_forcedupdate !is_lorry !ref_is_personal
 
-# Everyone else can do reffy things inside refs/heads/##PREFIX##
+# Everyone else can do reffy things inside refs/heads/{{ TROVE_ID }}
 allow "Project writers may alter any refs" op_is_reffy !is_lorry is_local_ref
 
diff --git a/share/gitano/skel/gitano-admin/rules/trove-project.lace b/share/gitano/skel/gitano-admin/rules/trove-project.lace
index 383ba98..c13b307 100644
--- a/share/gitano/skel/gitano-admin/rules/trove-project.lace
+++ b/share/gitano/skel/gitano-admin/rules/trove-project.lace
@@ -6,7 +6,7 @@
 #
 # Copyright 2012,2013 Codethink Limited
 #
-# Rules for ##PREFIX##/... repositories
+# Rules for {{ TROVE_ID }}/... repositories
 
 # Reading the repository
 allow "Project readers may read" op_read project_reader
diff --git a/share/gitano/skel/gitano-admin/users/distbuild/user.conf b/share/gitano/skel/gitano-admin/users/distbuild/user.conf
index 62ac3f5..6954826 100644
--- a/share/gitano/skel/gitano-admin/users/distbuild/user.conf
+++ b/share/gitano/skel/gitano-admin/users/distbuild/user.conf
@@ -1,2 +1,2 @@
-email_address "distbuild@##TROVE_HOSTNAME##"
+email_address "distbuild@{{ TROVE_HOSTNAME }}"
 real_name "Baserock Distributed Build Service"
diff --git a/share/gitano/skel/gitano-admin/users/lorry/user.conf b/share/gitano/skel/gitano-admin/users/lorry/user.conf
index f21fac7..d00b635 100644
--- a/share/gitano/skel/gitano-admin/users/lorry/user.conf
+++ b/share/gitano/skel/gitano-admin/users/lorry/user.conf
@@ -1,2 +1,2 @@
-email_address "lorry@##TROVE_HOSTNAME##"
+email_address "lorry@{{ TROVE_HOSTNAME }}"
 real_name "Source Code Lorry Service"
diff --git a/share/gitano/skel/gitano-admin/users/mason/user.conf b/share/gitano/skel/gitano-admin/users/mason/user.conf
index 639de4e..3139295 100644
--- a/share/gitano/skel/gitano-admin/users/mason/user.conf
+++ b/share/gitano/skel/gitano-admin/users/mason/user.conf
@@ -1,2 +1,2 @@
-email_address "mason@##TROVE_HOSTNAME##"
+email_address "mason@{{ TROVE_HOSTNAME }}"
 real_name "Baserock Continuous Integration Service"