diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2008-01-31 07:59:02 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2008-01-31 07:59:02 -0800 |
| commit | 622bbf801bd435a3848c669ff2c0e9090cd2bb4e (patch) | |
| tree | 328d04410e8fed64e6a8b25abdf58f199d916c2d /templates/system/package | |
| parent | c2c002021eab0adff7e4d268535170658a1b0c6c (diff) | |
| download | vyatta-cfg-system-622bbf801bd435a3848c669ff2c0e9090cd2bb4e.tar.gz vyatta-cfg-system-622bbf801bd435a3848c669ff2c0e9090cd2bb4e.zip | |
convert templates to new syntax
Diffstat (limited to 'templates/system/package')
7 files changed, 22 insertions, 22 deletions
diff --git a/templates/system/package/auto-sync/node.def b/templates/system/package/auto-sync/node.def index 277a5fe4..9300848e 100644 --- a/templates/system/package/auto-sync/node.def +++ b/templates/system/package/auto-sync/node.def @@ -3,10 +3,10 @@ # the /etc/crontab file must have the daily line for daily to be run type: u32 default: 1 -help: "Update the the repository cache every n days. 0 disables auto-update." -syntax: $(@) >= 0 && $(@) < 32 ; "auto-sync must be between 0 and 32 days" -update: "sudo sh -c \"touch /etc/apt/apt.conf && \ +help: Update the the repository cache every n days. 0 disables auto-update. +syntax:expression: $VAR(@) >= 0 && $VAR(@) < 32 ; "auto-sync must be between 0 and 32 days" +update:expression: "sudo sh -c \"touch /etc/apt/apt.conf && \ sed -i '/APT::Periodic::Update-Package-Lists*/d' /etc/apt/apt.conf && \ -echo \\\"APT::Periodic::Update-Package-Lists \\\"$(@)\\\";\\\" >> /etc/apt/apt.conf\" " -delete: "sudo sh -c \"touch /etc/apt/apt.conf && \ +echo \\\"APT::Periodic::Update-Package-Lists \\\"$VAR(@)\\\";\\\" >> /etc/apt/apt.conf\" " +delete:expression: "sudo sh -c \"touch /etc/apt/apt.conf && \ sed -i '/APT::Periodic::Update-Package-Lists*/d' /etc/apt/apt.conf\" " diff --git a/templates/system/package/node.def b/templates/system/package/node.def index ce185fa9..3330033a 100644 --- a/templates/system/package/node.def +++ b/templates/system/package/node.def @@ -1 +1 @@ -help: "Package Update Repository Configuration" +help: Package Update Repository Configuration diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def index d0c89e28..e07967ee 100644 --- a/templates/system/package/repository/node.def +++ b/templates/system/package/repository/node.def @@ -1,11 +1,11 @@ tag: type: txt -help: "Name describing the repository" -commit: $(./url/) != ""; "Must configure the repository URL" -commit: $(./distribution/) != ""; "Must configure the repository distribution" -commit: $(./components/) != ""; "Must configure the repository component" -update: "sudo sh -c \"touch /etc/apt/sources.list && \ -sed -i '\\!# $(@) #!d' /etc/apt/sources.list && \ -echo \\\"deb $(url/@)/ $(distribution/@) $(components/@) # $(@) #\\\" >> /etc/apt/sources.list\" " -delete: "sudo sh -c \"touch /etc/apt/sources.list && \ -sed -i '\\!# $(@) #!d' /etc/apt/sources.list\" " +help: Name describing the repository +commit:expression: $VAR(./url/) != ""; "Must configure the repository URL" +commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution" +commit:expression: $VAR(./components/) != ""; "Must configure the repository component" +update:expression: "sudo sh -c \"touch /etc/apt/sources.list && \ +sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list && \ +echo \\\"deb $VAR(url/@)/ $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\\\" >> /etc/apt/sources.list\" " +delete:expression: "sudo sh -c \"touch /etc/apt/sources.list && \ +sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list\" " diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def index 3cc0dc24..51ab9580 100644 --- a/templates/system/package/repository/node.tag/components/node.def +++ b/templates/system/package/repository/node.tag/components/node.def @@ -1,4 +1,4 @@ type: txt -help: "Repository component names" +help: Repository component names # need to prohibit '!' in repo name (sed delimiter) -syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in component name" +syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in component name" diff --git a/templates/system/package/repository/node.tag/description/node.def b/templates/system/package/repository/node.tag/description/node.def index 9ce7dac6..e187f9e4 100644 --- a/templates/system/package/repository/node.tag/description/node.def +++ b/templates/system/package/repository/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: "Repository description" +help: Repository description diff --git a/templates/system/package/repository/node.tag/distribution/node.def b/templates/system/package/repository/node.tag/distribution/node.def index ad54b70d..39235a6a 100644 --- a/templates/system/package/repository/node.tag/distribution/node.def +++ b/templates/system/package/repository/node.tag/distribution/node.def @@ -1,4 +1,4 @@ type: txt -help: "Distribution name" +help: Distribution name # need to prohibit '!' in repo name (sed delimiter) -syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in distribution name" +syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in distribution name" diff --git a/templates/system/package/repository/node.tag/url/node.def b/templates/system/package/repository/node.tag/url/node.def index ae05e6c6..7c84afce 100644 --- a/templates/system/package/repository/node.tag/url/node.def +++ b/templates/system/package/repository/node.tag/url/node.def @@ -1,4 +1,4 @@ type: txt -help: "Repository URL" +help: Repository URL # need to prohibit '!' in url (sed delimiter) -syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in url" +syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in url" |