summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-09-02 13:27:20 +0200
committerChristian Poessinger <christian@poessinger.com>2018-09-02 13:27:20 +0200
commitf376e679eb75b990f8f73feab80e34d485a28178 (patch)
tree06e4d512b9524882c124e6b330be5c1411f388fc
parentc915ac0722b5ec8782d4fe3748116b98f9fe978f (diff)
downloadvyatta-cfg-system-f376e679eb75b990f8f73feab80e34d485a28178.tar.gz
vyatta-cfg-system-f376e679eb75b990f8f73feab80e34d485a28178.zip
T825: remove deprecated 'set system package'
-rw-r--r--cfg-version/system@9 (renamed from cfg-version/system@8)0
-rw-r--r--templates/system/package/auto-sync/node.def18
-rw-r--r--templates/system/package/node.def2
-rw-r--r--templates/system/package/repository/node.def32
-rw-r--r--templates/system/package/repository/node.tag/components/node.def6
-rw-r--r--templates/system/package/repository/node.tag/description/node.def3
-rw-r--r--templates/system/package/repository/node.tag/distribution/node.def6
-rw-r--r--templates/system/package/repository/node.tag/password/node.def8
-rw-r--r--templates/system/package/repository/node.tag/url/node.def6
-rw-r--r--templates/system/package/repository/node.tag/username/node.def8
10 files changed, 0 insertions, 89 deletions
diff --git a/cfg-version/system@8 b/cfg-version/system@9
index e69de29b..e69de29b 100644
--- a/cfg-version/system@8
+++ b/cfg-version/system@9
diff --git a/templates/system/package/auto-sync/node.def b/templates/system/package/auto-sync/node.def
deleted file mode 100644
index 9eec0faa..00000000
--- a/templates/system/package/auto-sync/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-# this will set APT::Periodic::Update-Package-Lists in /etc/apt/apt.conf
-# apt.conf is in turn read by the apt cron file loacted in /etc/cron.daily/apt
-# 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: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 \\\"$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
deleted file mode 100644
index c19c92de..00000000
--- a/templates/system/package/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-priority: 400
-help: Package update repository parameters
diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def
deleted file mode 100644
index c84060e2..00000000
--- a/templates/system/package/repository/node.def
+++ /dev/null
@@ -1,32 +0,0 @@
-tag:
-
-type: txt
-
-help: Debian archive name
-
-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 components"
-
-end:
- if [ ${COMMIT_ACTION} = 'SET' -o ${COMMIT_ACTION} = 'ACTIVE' ]; then
- if [ ${COMMIT_ACTION} = 'SET' ]; then
- echo "Adding new entry to /etc/apt/sources.list..."
- else
- echo "Updating /etc/apt/sources.list..."
- fi
- sudo bash -c "touch /etc/apt/sources.list && \
- sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list && \
- echo \"deb $VAR(url/@) $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\" >> /tmp/$$-sources.list && \
- if [ $VAR(password/@) ] || [ $VAR(username/@) ]; \
- then \
- sed -i "s!://.*@!://!" /tmp/$$-sources.list; \
- sed -i "s!://!://$VAR(username/@):$VAR(password/@)@!" /tmp/$$-sources.list; \
- fi && \
- cat /tmp/$$-sources.list>>/etc/apt/sources.list ; \
- rm -f /tmp/$$-sources.list"
- elif [ ${COMMIT_ACTION} = 'DELETE' ]; then
- echo "Removing entry from /etc/apt/sources.list..."
- sudo sh -c "touch /etc/apt/sources.list && \
- sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list"
- fi
diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def
deleted file mode 100644
index 606f7bb6..00000000
--- a/templates/system/package/repository/node.tag/components/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-
-help: Repository component names
-
-# need to prohibit '!' in repo name (sed delimiter)
-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
deleted file mode 100644
index 8b686f06..00000000
--- a/templates/system/package/repository/node.tag/description/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-
-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
deleted file mode 100644
index ae88cb42..00000000
--- a/templates/system/package/repository/node.tag/distribution/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-
-help: Distribution name
-
-# need to prohibit '!' in repo name (sed delimiter)
-syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in distribution name"
diff --git a/templates/system/package/repository/node.tag/password/node.def b/templates/system/package/repository/node.tag/password/node.def
deleted file mode 100644
index 34ccff27..00000000
--- a/templates/system/package/repository/node.tag/password/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-
-help: Repository password
-
-default: ""
-
-# need to prohibit '!' in url (sed delimiter)
-syntax:expression: pattern $VAR(@) "^[^!]*$" ; "Do not use '!' in url"
diff --git a/templates/system/package/repository/node.tag/url/node.def b/templates/system/package/repository/node.tag/url/node.def
deleted file mode 100644
index 3fad02e8..00000000
--- a/templates/system/package/repository/node.tag/url/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-
-help: Repository URL
-
-# need to prohibit '!' in url (sed delimiter)
-syntax:expression: pattern $VAR(@) "^[^!]+$" ; "URL must not be null and must not contain '!'"
diff --git a/templates/system/package/repository/node.tag/username/node.def b/templates/system/package/repository/node.tag/username/node.def
deleted file mode 100644
index d22dd7cb..00000000
--- a/templates/system/package/repository/node.tag/username/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-
-help: Repository username
-
-default: ""
-
-# need to prohibit '!' in url (sed delimiter)
-syntax:expression: pattern $VAR(@) "^[^!]*$" ; "Do not use '!' in url"