Increased Ubuntu support

8 files changed, 35 insertions, 7 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 4606a94..e459bd8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -49,7 +49,7 @@ class apt {
 			# include main, security and backports
 			# additional sources could be included via an array
 			"/etc/apt/sources.list":
-				content => template("apt/sources.list.erb"),
+				content => template("apt/${operatingsystem}/sources.list.erb"),
 				require => Exec[assert_lsbdistcodename];
 		}
 	}
@@ -111,8 +111,8 @@ class apt {
 	  'true': {   
 	      config_file {
 		      # backports
-		      "/etc/apt/sources.list.d/debian-backports.list":
-			      content => template("apt/sources.list.backports.erb"),
+		      "/etc/apt/sources.list.d/${operatingsystem}-backports.list":
+			      content => template("apt/${operatingsystem}/sources.list.backports.erb"),
 			      require => Exec[assert_lsbdistcodename];
 	      }
 		
@@ -164,8 +164,8 @@ class apt {
 	case $apt_deb_src_enabled {
 	  'true': {   
 	      config_file {
-		      "/etc/apt/sources.list.d/debian-sources.list":
-			      content => template("apt/sources.list.deb-src.erb"),
+		      "/etc/apt/sources.list.d/${operatingsystem}-sources.list":
+			      content => template("apt/${operatingsystem}/sources.list.deb-src.erb"),
 			      require => Exec[assert_lsbdistcodename];
 	      }
 	  }		
@@ -175,8 +175,8 @@ class apt {
 	case $apt_volatile_enabled {
 	  'true': {   
 	      config_file {
-		      "/etc/apt/sources.list.d/debian-volatile.list":
-			      content => template("apt/sources.list.volatile.erb"),
+		      "/etc/apt/sources.list.d/${operatingsystem}-volatile.list":
+			      content => template("apt/${operatingsystem}/sources.list.volatile.erb"),
 			      require => Exec[assert_lsbdistcodename];
 	      }
 	  }		
diff --git a/templates/sources.list.backports.erb b/templates/Debian/sources.list.backports.erb
index b62f6d3..b62f6d3 100644
--- a/templates/sources.list.backports.erb
+++ b/templates/Debian/sources.list.backports.erb
diff --git a/templates/sources.list.deb-src.erb b/templates/Debian/sources.list.deb-src.erb
index 6811eca..6811eca 100644
--- a/templates/sources.list.deb-src.erb
+++ b/templates/Debian/sources.list.deb-src.erb
diff --git a/templates/sources.list.erb b/templates/Debian/sources.list.erb
index feb5603..feb5603 100644
--- a/templates/sources.list.erb
+++ b/templates/Debian/sources.list.erb
diff --git a/templates/sources.list.volatile.erb b/templates/Debian/sources.list.volatile.erb
index 06d6590..06d6590 100644
--- a/templates/sources.list.volatile.erb
+++ b/templates/Debian/sources.list.volatile.erb
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
+
+