From 2b2950b20e2b171c2798e1265cde62a44382616f Mon Sep 17 00:00:00 2001 From: nadir Date: Thu, 10 Dec 2009 11:00:00 +0100 Subject: added $backports_enabled for including backports repository --- templates/sources.list.backports.erb | 8 ++++++++ templates/sources.list.erb | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 templates/sources.list.backports.erb (limited to 'templates') diff --git a/templates/sources.list.backports.erb b/templates/sources.list.backports.erb new file mode 100644 index 0000000..b62f6d3 --- /dev/null +++ b/templates/sources.list.backports.erb @@ -0,0 +1,8 @@ +# This file is brought to you by puppet + +# backports +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> +# There are no backports for for <%= lsbdistcodename %> +<% else -%> +deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main +<% end -%> diff --git a/templates/sources.list.erb b/templates/sources.list.erb index 169d7b5..feb5603 100644 --- a/templates/sources.list.erb +++ b/templates/sources.list.erb @@ -9,9 +9,3 @@ deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free <% end -%> -# backports -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There are no backports for for <%= lsbdistcodename %> -<% else -%> -deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main -<% end -%> -- cgit v1.2.3 From 854f3c10b09b46ef9d9fce5293dd0665b619065e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Dec 2009 17:51:49 +0100 Subject: Added apt::unattended_upgrades class, and extra template for "deb-src" --- templates/sources.list.deb-src.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 templates/sources.list.deb-src.erb (limited to 'templates') diff --git a/templates/sources.list.deb-src.erb b/templates/sources.list.deb-src.erb new file mode 100644 index 0000000..6811eca --- /dev/null +++ b/templates/sources.list.deb-src.erb @@ -0,0 +1,11 @@ +# This file is brought to you by puppet + +# basic <%= lsbdistcodename %> +deb-src http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free +# security suppport +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> +# There is no security mirror for <%= lsbdistcodename %> +<% else -%> +deb-src http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free +<% end -%> + -- cgit v1.2.3 From 0c86627838c5cafbc4f6c5ecfaf389a90e0dcc20 Mon Sep 17 00:00:00 2001 From: nadir Date: Sun, 13 Dec 2009 15:14:39 +0100 Subject: added $apt_volatile_enabled, updated README --- templates/sources.list.volatile.erb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 templates/sources.list.volatile.erb (limited to 'templates') diff --git a/templates/sources.list.volatile.erb b/templates/sources.list.volatile.erb new file mode 100644 index 0000000..06d6590 --- /dev/null +++ b/templates/sources.list.volatile.erb @@ -0,0 +1,7 @@ +# This file is brought to you by puppet + +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable" || lsbdistcodename == "squeeze") -%> +# There are no backports for for <%= lsbdistcodename %> +<% else -%> +deb http://volatile.debian.org/debian-volatile <%= lsbdistcodename %>/volatile main contrib non-free +<% end -%> -- cgit v1.2.3 From 5972a3556617b4a9acfb0046ee44164bf9b2f517 Mon Sep 17 00:00:00 2001 From: Varac Date: Thu, 17 Dec 2009 15:53:27 +0100 Subject: Increased Ubuntu support --- templates/Debian/sources.list.backports.erb | 8 ++++++++ templates/Debian/sources.list.deb-src.erb | 11 +++++++++++ templates/Debian/sources.list.erb | 11 +++++++++++ templates/Debian/sources.list.volatile.erb | 7 +++++++ templates/Ubuntu/sources.list.backports.erb | 4 ++++ templates/Ubuntu/sources.list.deb-src.erb | 12 ++++++++++++ templates/Ubuntu/sources.list.erb | 12 ++++++++++++ templates/sources.list.backports.erb | 8 -------- templates/sources.list.deb-src.erb | 11 ----------- templates/sources.list.erb | 11 ----------- templates/sources.list.volatile.erb | 7 ------- 11 files changed, 65 insertions(+), 37 deletions(-) create mode 100644 templates/Debian/sources.list.backports.erb create mode 100644 templates/Debian/sources.list.deb-src.erb create mode 100644 templates/Debian/sources.list.erb create mode 100644 templates/Debian/sources.list.volatile.erb create mode 100644 templates/Ubuntu/sources.list.backports.erb create mode 100644 templates/Ubuntu/sources.list.deb-src.erb create mode 100644 templates/Ubuntu/sources.list.erb delete mode 100644 templates/sources.list.backports.erb delete mode 100644 templates/sources.list.deb-src.erb delete mode 100644 templates/sources.list.erb delete mode 100644 templates/sources.list.volatile.erb (limited to 'templates') diff --git a/templates/Debian/sources.list.backports.erb b/templates/Debian/sources.list.backports.erb new file mode 100644 index 0000000..b62f6d3 --- /dev/null +++ b/templates/Debian/sources.list.backports.erb @@ -0,0 +1,8 @@ +# This file is brought to you by puppet + +# backports +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> +# There are no backports for for <%= lsbdistcodename %> +<% else -%> +deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main +<% end -%> diff --git a/templates/Debian/sources.list.deb-src.erb b/templates/Debian/sources.list.deb-src.erb new file mode 100644 index 0000000..6811eca --- /dev/null +++ b/templates/Debian/sources.list.deb-src.erb @@ -0,0 +1,11 @@ +# This file is brought to you by puppet + +# basic <%= lsbdistcodename %> +deb-src http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free +# security suppport +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> +# There is no security mirror for <%= lsbdistcodename %> +<% else -%> +deb-src http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free +<% end -%> + diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb new file mode 100644 index 0000000..feb5603 --- /dev/null +++ b/templates/Debian/sources.list.erb @@ -0,0 +1,11 @@ +# This file is brought to you by puppet + +# basic <%= lsbdistcodename %> +deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free +# security suppport +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> +# There is no security mirror for <%= lsbdistcodename %> +<% else -%> +deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free +<% end -%> + diff --git a/templates/Debian/sources.list.volatile.erb b/templates/Debian/sources.list.volatile.erb new file mode 100644 index 0000000..06d6590 --- /dev/null +++ b/templates/Debian/sources.list.volatile.erb @@ -0,0 +1,7 @@ +# This file is brought to you by puppet + +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable" || lsbdistcodename == "squeeze") -%> +# There are no backports for for <%= lsbdistcodename %> +<% else -%> +deb http://volatile.debian.org/debian-volatile <%= lsbdistcodename %>/volatile main contrib non-free +<% end -%> diff --git a/templates/Ubuntu/sources.list.backports.erb b/templates/Ubuntu/sources.list.backports.erb new file mode 100644 index 0000000..66610a6 --- /dev/null +++ b/templates/Ubuntu/sources.list.backports.erb @@ -0,0 +1,4 @@ +# This file is brought to you by puppet + +# backports +deb http://archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-backports main universe multiverse restricted diff --git a/templates/Ubuntu/sources.list.deb-src.erb b/templates/Ubuntu/sources.list.deb-src.erb new file mode 100644 index 0000000..f04de67 --- /dev/null +++ b/templates/Ubuntu/sources.list.deb-src.erb @@ -0,0 +1,12 @@ +# This file is brought to you by puppet + +# basic <%= lsbdistcodename %> +deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> main restricted universe multiverse + +# updates +deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-updates main restricted universe multiverse + +# security suppport +deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-security main restricted universe multiverse + + diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb new file mode 100644 index 0000000..dfecd63 --- /dev/null +++ b/templates/Ubuntu/sources.list.erb @@ -0,0 +1,12 @@ +# This file is brought to you by puppet + +# basic <%= lsbdistcodename %> +deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> main restricted universe multiverse + +# updates +deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-updates main restricted universe multiverse + +# security suppport +deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-security main restricted universe multiverse + + diff --git a/templates/sources.list.backports.erb b/templates/sources.list.backports.erb deleted file mode 100644 index b62f6d3..0000000 --- a/templates/sources.list.backports.erb +++ /dev/null @@ -1,8 +0,0 @@ -# This file is brought to you by puppet - -# backports -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There are no backports for for <%= lsbdistcodename %> -<% else -%> -deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main -<% end -%> diff --git a/templates/sources.list.deb-src.erb b/templates/sources.list.deb-src.erb deleted file mode 100644 index 6811eca..0000000 --- a/templates/sources.list.deb-src.erb +++ /dev/null @@ -1,11 +0,0 @@ -# This file is brought to you by puppet - -# basic <%= lsbdistcodename %> -deb-src http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free -# security suppport -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There is no security mirror for <%= lsbdistcodename %> -<% else -%> -deb-src http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free -<% end -%> - diff --git a/templates/sources.list.erb b/templates/sources.list.erb deleted file mode 100644 index feb5603..0000000 --- a/templates/sources.list.erb +++ /dev/null @@ -1,11 +0,0 @@ -# This file is brought to you by puppet - -# basic <%= lsbdistcodename %> -deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free -# security suppport -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There is no security mirror for <%= lsbdistcodename %> -<% else -%> -deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free -<% end -%> - diff --git a/templates/sources.list.volatile.erb b/templates/sources.list.volatile.erb deleted file mode 100644 index 06d6590..0000000 --- a/templates/sources.list.volatile.erb +++ /dev/null @@ -1,7 +0,0 @@ -# This file is brought to you by puppet - -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable" || lsbdistcodename == "squeeze") -%> -# There are no backports for for <%= lsbdistcodename %> -<% else -%> -deb http://volatile.debian.org/debian-volatile <%= lsbdistcodename %>/volatile main contrib non-free -<% end -%> -- cgit v1.2.3 From db06babc5d095292c11445b9e76dd133943b7840 Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 9 Oct 2010 13:42:26 +0200 Subject: removed backports template in favor of main sources.list --- templates/Debian/sources.list.backports.erb | 8 -------- templates/Debian/sources.list.erb | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 templates/Debian/sources.list.backports.erb (limited to 'templates') diff --git a/templates/Debian/sources.list.backports.erb b/templates/Debian/sources.list.backports.erb deleted file mode 100644 index b62f6d3..0000000 --- a/templates/Debian/sources.list.backports.erb +++ /dev/null @@ -1,8 +0,0 @@ -# This file is brought to you by puppet - -# backports -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There are no backports for for <%= lsbdistcodename %> -<% else -%> -deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main -<% end -%> diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index feb5603..169d7b5 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -9,3 +9,9 @@ deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free <% end -%> +# backports +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> +# There are no backports for for <%= lsbdistcodename %> +<% else -%> +deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main +<% end -%> -- cgit v1.2.3