From a1391120ed267bc0b809482cb7282ea032b3cfca Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 17 Jun 2014 13:34:14 +0000 Subject: Change placeholders to jinja placeholders --- share/README.lorry-controller | 2 +- share/etc/cgitrc | 6 +++--- share/etc/gitano-setup.clod | 4 ++-- share/etc/lorry.conf | 2 +- share/gitano/skel/gitano-admin/global-hooks/post-receive.lua | 6 +++--- share/gitano/skel/gitano-admin/rules/createrepo.lace | 2 +- share/gitano/skel/gitano-admin/rules/defines.lace | 8 ++++---- share/gitano/skel/gitano-admin/rules/other-project.lace | 6 +++--- share/gitano/skel/gitano-admin/rules/trove-project.lace | 2 +- share/gitano/skel/gitano-admin/users/distbuild/user.conf | 2 +- share/gitano/skel/gitano-admin/users/lorry/user.conf | 2 +- share/gitano/skel/gitano-admin/users/mason/user.conf | 2 +- share/lorry-controller.conf | 8 ++++---- share/releases-repo-README | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/share/README.lorry-controller b/share/README.lorry-controller index 1c70617..3bd0a90 100644 --- a/share/README.lorry-controller +++ b/share/README.lorry-controller @@ -14,5 +14,5 @@ scenarios regarding adding external software to your Trove before attempting to add any additional configuration to this repository. Remember, the Lorry tool is not permitted to manage repositories inside your -prefix which is ##PREFIX##. +prefix which is {{ TROVE_ID }}. diff --git a/share/etc/cgitrc b/share/etc/cgitrc index c526e17..28540dd 100644 --- a/share/etc/cgitrc +++ b/share/etc/cgitrc @@ -1,4 +1,4 @@ -clone-prefix=git://##TROVE_HOSTNAME## http://##TROVE_HOSTNAME##/git https://##TROVE_HOSTNAME##/git ssh://git@##TROVE_HOSTNAME## +clone-prefix=git://{{ TROVE_HOSTNAME }} http://{{ TROVE_HOSTNAME }}/git https://{{ TROVE_HOSTNAME }}/git ssh://git@{{ TROVE_HOSTNAME }} strict-export=git-daemon-export-ok css=/cgit/cgit.css @@ -8,8 +8,8 @@ head-include=/etc/cgit-trove-head.inc footer=/etc/cgit-trove-footer.inc enable-index-links=1 -root-title=##TROVE_TITLE## Git Repositories -root-desc=Baserock Trove -- For ##TROVE_COMPANY## +root-title={{ TROVE_ID }} Git Repositories +root-desc=Baserock Trove -- For {{ TROVE_COMPANY }} snapshots=tar.gz enable-commit-graph=1 enable-log-filecount=1 diff --git a/share/etc/gitano-setup.clod b/share/etc/gitano-setup.clod index b63aeb6..6139c4e 100644 --- a/share/etc/gitano-setup.clod +++ b/share/etc/gitano-setup.clod @@ -10,8 +10,8 @@ admin.realname "Trove Instance Administrator" admin.email "trove@trove-instance" admin.keyname "trove" -site.name "##TROVE_TITLE## for ##TROVE_COMPANY##" -log.prefix "##TROVE_LOG_PREFIX##" +site.name "{{ TROVE_ID }} for {{ TROVE_COMPANY }}" +log.prefix "{{ TROVE_ID }}" use.htpasswd "yes" diff --git a/share/etc/lorry.conf b/share/etc/lorry.conf index 16552cb..cc94e8d 100644 --- a/share/etc/lorry.conf +++ b/share/etc/lorry.conf @@ -1,6 +1,6 @@ [config] mirror-base-url-push = ssh://git@localhost -mirror-base-url-fetch = git://##TROVE_HOSTNAME## +mirror-base-url-fetch = git://{{ TROVE_HOSTNAME }} bundle = never bundle-dest = /home/lorry/bundles tarball = always 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 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" diff --git a/share/lorry-controller.conf b/share/lorry-controller.conf index bdbbbd5..0c90cc4 100644 --- a/share/lorry-controller.conf +++ b/share/lorry-controller.conf @@ -1,9 +1,9 @@ [ { "type": "trove", - "uuid": "##PREFIX##/initial", + "uuid": "{{ TROVE_ID }}/initial", "serial": 1, - "trovehost": "##UPSTREAM_TROVE##", + "trovehost": "{{ UPSTREAM_TROVE }}", "protocol": "ssh", "ls-interval": "4H", "interval": "2H", @@ -21,7 +21,7 @@ }, { "type": "lorries", - "uuid": "##PREFIX##/open-source-lorries", + "uuid": "{{ TROVE_ID }}/open-source-lorries", "serial": 1, "interval": "6H", "create": "always", @@ -35,7 +35,7 @@ }, { "type": "lorries", - "uuid": "##PREFIX##/closed-source-lorries", + "uuid": "{{ TROVE_ID }}/closed-source-lorries", "serial": 1, "interval": "6H", "create": "always", diff --git a/share/releases-repo-README b/share/releases-repo-README index d3f872b..69ee875 100644 --- a/share/releases-repo-README +++ b/share/releases-repo-README @@ -2,10 +2,10 @@ site/releases repository ------------------------ This is a special repository for distributing release binaries over HTTP. -Visit http://##PREFIX##/releases/ to browse content. +Visit http://{{ TROVE_ID }}/releases/ to browse content. To add a release to this repository, you need to be a member of the Gitano group site-writers. With the correct permissions, you can push releases to the repository by doing: - rsync $RELEASE git@##PREFIX##:##PREFIX##/site/releases + rsync $RELEASE git@{{ TROVE_HOSTNAME }}:{{ TROVE_ID }}/site/releases -- cgit v1.2.1