merge with riseups master

2 files changed, 19 insertions, 38 deletions

diff --git a/README b/README
index 5f990f5..1dbb995 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
-forked from https://labs.riseup.net/code/projects/show/module-apt
-
 
 Overview
 ========
@@ -72,39 +70,11 @@ apt keyring, you can set this variable to a path in your fileserver
 where individual key files can be placed. If this is set and keys
 exist there, this module will apt-key add each key
 
-$backports_enabled
-------------------
-If set to true, the debian backports repository is enabled through a 
-file in /etc/apt/sources.d/. Defaults to true.
-
-$apt_deb_src_enabled
---------------------
-If set to true, the debian sources repository is enabled through a 
-file in /etc/apt/sources.d/. Defaults to false.
-
-$apt_volatile_enabled
---------------------
-If set to true, the debiani volatile repository is enabled through a 
-file in /etc/apt/sources.d/. Defaults to false.
-
-
 Classes
 =======
-apt
----
-Sets up the basic apt package management.
-
-apt::unattended_upgrades
-------------------------
-Sets up the unattended-upgrades package, and configures it mostly through 
-the file /etc/apt/apt.conf.d/50unattended-upgrades.
-Unfortunately there seems to be a bug in unattended-upgrades <= 0.25.1 that 
-wildcards aren't recognized, so use it with care !
-http://packages.debian.org/de/lenny/unattended-upgrades
 
-apt::cron
----------
-Deploys a cronjob to run apt-get update && apt-get autoclean every hour
+This module contains only the apt class, which sets up all described
+functionality.
 
 
 Resources
@@ -150,12 +120,6 @@ upgrade_package { "perl":
 		  "perl-modules":
 }
 
-apt::custom_sources_template
-----------------------------
-Deploys custom sources in /etc/apt/sources.list.d, i.e.
-
-    apt::custom_sources_template { "site-apt/my-repository.list.erb": sources_file => "my-repository.list" }
-
 TODO
 ====
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 2d05722..87668fd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -107,18 +107,31 @@ class apt {
 				File["/etc/apt/preferences"], File["/etc/apt/apt.conf.d"],
 				File[apt_config] ];
 	}
+	      
+	## This package should really always be current
+	package { "debian-archive-keyring":
+	  ensure => latest,
+	}
 
+<<<<<<< HEAD
 	## This package should really always be current
 	package { "debian-archive-keyring":
 	  ensure => latest,
 	}
 
+=======
+>>>>>>> riseup/master
 	case $backports_enabled {
 	  'true': {   
 	      config_file {
 		      # backports
+<<<<<<< HEAD
 		      "/etc/apt/sources.list.d/${operatingsystem}-backports.list":
 			      content => template("apt/${operatingsystem}/sources.list.backports.erb"),
+=======
+		      "/etc/apt/sources.list.d/debian-backports.list":
+			      content => template("apt/sources.list.backports.erb"),
+>>>>>>> riseup/master
 			      require => Exec[assert_lsbdistcodename];
 	      }
 		
@@ -167,6 +180,7 @@ class apt {
 	  default: { }
 	}
 
+<<<<<<< HEAD
 	case $apt_deb_src_enabled {
 	  'true': {   
 	      config_file {
@@ -188,6 +202,9 @@ class apt {
 	  }		
    	  default: {}
  	}
+=======
+    
+>>>>>>> riseup/master
 
         case $custom_key_dir {
           '': {