merge with riseups master

diff --cc manifests/init.pp
index 2d05722af935f5f80c4cb5db815a5bbd5515b407,1af6e1fc760b0f94c79ac1d63a4d483225f01569..87668fd74107c6aef7758f23e2bb06950c6af575
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -106,19 -84,24 +106,32 @@@ class apt 
                        subscribe => [ File["/etc/apt/sources.list"],
                                File["/etc/apt/preferences"], File["/etc/apt/apt.conf.d"],
                                File[apt_config] ];
 -              "/usr/bin/apt-get update && /usr/bin/apt-get autoclean #hourly":
 -                      require => [ File["/etc/apt/sources.list"],
 -                              File["/etc/apt/preferences"], File[apt_config] ],
 -                      # Another Semaphor for all packages to reference
 -                      alias => apt_updated;
        }
+             
+       ## 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,27 -150,7 +180,31 @@@
          default: { }
        }
  
++<<<<<<< HEAD
 +      case $apt_deb_src_enabled {
 +        'true': {   
 +            config_file {
 +                    "/etc/apt/sources.list.d/${operatingsystem}-sources.list":
 +                            content => template("apt/${operatingsystem}/sources.list.deb-src.erb"),
 +                            require => Exec[assert_lsbdistcodename];
 +            }
 +        }             
 +        default: {}
 +      }
 +
 +      case $apt_volatile_enabled {
 +        'true': {   
 +            config_file {
 +                    "/etc/apt/sources.list.d/${operatingsystem}-volatile.list":
 +                            content => template("apt/${operatingsystem}/sources.list.volatile.erb"),
 +                            require => Exec[assert_lsbdistcodename];
 +            }
 +        }             
 +        default: {}
 +      }
++=======
+     
++>>>>>>> riseup/master
  
          case $custom_key_dir {
            '': {