summaryrefslogtreecommitdiff
path: root/skel
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2013-05-23 22:00:52 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2013-05-23 22:00:52 +0100
commit69fb628e6211602ee9e3826f66b144483e42bf26 (patch)
tree331a6e2290ba198a2634a22e1c6abd61688e8801 /skel
parentba274d571b3e36b8ab0ea62981709947d848922a (diff)
downloadgitano-69fb628e6211602ee9e3826f66b144483e42bf26.tar.gz
LACE: Add prefix and suffix simple matches
This adds prefix and suffix simple matches and updates the default ruleset to use them as appropriate. This actually eliminates almost all pattern matches from the default ruleset.
Diffstat (limited to 'skel')
-rw-r--r--skel/gitano-admin/rules/adminchecks.lace4
-rw-r--r--skel/gitano-admin/rules/createrepo.lace2
-rw-r--r--skel/gitano-admin/rules/defines.lace2
3 files changed, 4 insertions, 4 deletions
diff --git a/skel/gitano-admin/rules/adminchecks.lace b/skel/gitano-admin/rules/adminchecks.lace
index 75ca753..41bb170 100644
--- a/skel/gitano-admin/rules/adminchecks.lace
+++ b/skel/gitano-admin/rules/adminchecks.lace
@@ -9,8 +9,8 @@ deny "Non-administrators may not delete the admin ref" op_deleteref
# By default, you don't want anything but gitano-admin members to touch
# anything in the hooks/ tree, so don't allow that
-define contains_hooks target_tree ~^hooks/
-define updates_hooks treediff/targets ~^hooks/
+define contains_hooks target_tree prefix hooks/
+define updates_hooks treediff/targets prefix hooks/
deny "Attempt to create hooks" op_createref contains_hooks
deny "Attempt to alter hooks" op_is_update updates_hooks
diff --git a/skel/gitano-admin/rules/createrepo.lace b/skel/gitano-admin/rules/createrepo.lace
index 9085706..6807726 100644
--- a/skel/gitano-admin/rules/createrepo.lace
+++ b/skel/gitano-admin/rules/createrepo.lace
@@ -5,7 +5,7 @@
# Uncomment the following to allow repositories in personal/username/
-# define repo_is_personal repository ~^personal/${user}/
+# define repo_is_personal repository prefix personal/${user}/
# allow "Personal repo creation is okay" repo_is_personal
# Otherwise the default is that non-admins can't create repositories
diff --git a/skel/gitano-admin/rules/defines.lace b/skel/gitano-admin/rules/defines.lace
index f920948..0d7882a 100644
--- a/skel/gitano-admin/rules/defines.lace
+++ b/skel/gitano-admin/rules/defines.lace
@@ -68,5 +68,5 @@ define op_is_normal anyof op_fastforward op_createref op_deleteref
# Administration
define is_admin_repo repository gitano-admin
-define is_gitano_ref ref ~^refs/gitano/
+define is_gitano_ref ref prefix refs/gitano/
define is_admin_ref ref refs/gitano/admin