Merge remote-tracking branch 'origin/master' into zfs-backup

hieradata/common.yaml

@@ -111,5 +111,5 @@ kube_dev::controller_nodes:
     - hozer-74
 
 # Prometheus config
-prometheus::node_exporter::version: 1.3.1
+prometheus::node_exporter::version: 1.4.0
 prometheus::node_exporter::extra_options: '--collector.textfile.directory /srv/prometheus'

hieradata/dummy_secrets.yaml

@@ -58,8 +58,12 @@ kubernetes::keepalived::secret: dummysecret
 prometheus::docker_metrics_password: dummypassword
 
 mirrors::archlinuxcn_sync_password: dummypassword
+mirrors::blender_sync_password: dummypassword
 mirrors::finnix_sync_password: dummypassword
+mirrors::gimp_sync_password: dummypassword
 mirrors::gnome_sync_password: dummypassword
+mirrors::mx_linux_sync_password: dummypassword
+mirrors::mx_packages_sync_password: dummypassword
 
 xmpp::root_password: dummypassword
 xmpp::prosody_mysql_password: dummypassword

hieradata/nodes/arsenic.yaml

@@ -0,0 +1 @@
+ocf_desktop::xsession::scale: 1.5

hieradata/nodes/bigbang.yaml

@@ -0,0 +1 @@
+ocf_desktop::xsession::scale: 1.5

hieradata/nodes/blizzard.yaml

@@ -1 +1,2 @@
 opstaff: true
+ocf_desktop::xsession::scale: 1.5

hieradata/nodes/chaos.yaml

@@ -0,0 +1 @@
+ocf_desktop::xsession::scale: 1.5

hieradata/nodes/dataloss.yaml

@@ -5,7 +5,6 @@ ocf::packages::ntp::master: true
 ocf::packages::ntp::peers:
   - hal.ocf.berkeley.edu
   - pandemic.ocf.berkeley.edu
-  - jaws.ocf.berkeley.edu
   - riptide.ocf.berkeley.edu
 
 ocf_filehost::storage_device: '/dev/md/nfs'

hieradata/nodes/famine.yaml

@@ -0,0 +1 @@
+ocf_desktop::xsession::scale: 1.5

hieradata/nodes/hal.yaml

@@ -7,7 +7,6 @@ ocf::networking::bond: true
 
 ocf::packages::ntp::master: true
 ocf::packages::ntp::peers:
-    - jaws.ocf.berkeley.edu
     - pandemic.ocf.berkeley.edu
     - riptide.ocf.berkeley.edu
     - dataloss.ocf.berkeley.edu

hieradata/nodes/meteorstorm.yaml

@@ -0,0 +1 @@
+ocf_desktop::xsession::scale: 1.5

hieradata/nodes/pandemic.yaml

@@ -8,6 +8,5 @@ ocf::networking::bond: true
 ocf::packages::ntp::master: true
 ocf::packages::ntp::peers:
     - hal.ocf.berkeley.edu
-    - jaws.ocf.berkeley.edu
     - riptide.ocf.berkeley.edu
     - dataloss.ocf.berkeley.edu

hieradata/nodes/riptide.yaml

@@ -9,5 +9,4 @@ ocf::packages::ntp::master: true
 ocf::packages::ntp::peers:
     - hal.ocf.berkeley.edu
     - pandemic.ocf.berkeley.edu
-    - jaws.ocf.berkeley.edu
     - dataloss.ocf.berkeley.edu

hieradata/nodes/surge.yaml

@@ -0,0 +1 @@
+ocf_desktop::xsession::scale: 1.5

hieradata/nodes/wildfire.yaml

@@ -0,0 +1 @@
+ocf_desktop::xsession::scale: 1.5

modules/ocf/manifests/init.pp

@@ -13,7 +13,6 @@
   include ocf::locale
   include ocf::logging
   include ocf::motd
-  include ocf::munin::node
   include ocf::networking
   include ocf::node_exporter
   include ocf::packages

modules/ocf/templates/firefox/prefs.js.erb

@@ -3,8 +3,12 @@ pref("intl.locale.requested", "");
 pref("browser.startup.homepage", "<%= @browser_homepage %>", locked);
 pref("browser.cache.disk.capacity", 0);
 pref("browser.download.useDownloadDir", false);
+pref("browser.newtabpage.activity-stream.discoverystream.enabled", false);
 pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
+pref("browser.newtabpage.activity-stream.feeds.topsites", false);
 pref("browser.newtabpage.activity-stream.showSponsored", false);
+pref("browser.newtabpage.activity-stream.showSponsoredTopSite", false);
+pref("browser.newtabpage.activity-stream.telemetry", false);
 pref("browser.privatebrowsing.autostart", true);
 pref("browser.search.geoSpecificDefaults", false);
 pref("browser.shell.checkDefaultBrowser", false);

modules/ocf/templates/ssl/dehydrated-hook-ddns-tsig.conf.erb

@@ -5,5 +5,5 @@ verbosity = 1
 # not seem to be actually documented anywhere
 key_name = letsencrypt.ocf.io
 key_secret = "<%= @letsencrypt_ddns_key -%>"
-key_algorithm = hmac-md5
+key_algorithm = hmac-sha512
 dns_rewrite = s/^_acme-challenge\.(.*)(ocf\.berkeley\.edu|ocf\.io)$/\1letsencrypt.ocf.io/

modules/ocf_apt/manifests/init.pp

@@ -10,8 +10,6 @@
 
   package {
     [
-      'nginx-full',
-      'libnginx-mod-http-fancyindex',
       'reprepro',
     ]:;
   }
@@ -84,19 +82,13 @@
     ipv6_enable      => true,
     ipv6_listen_port => 80,
     format_log       => 'main',
-    raw_append       => @(END),
-      fancyindex on;
-      fancyindex_exact_size off;
-      END
+    autoindex        => 'on',
   }
   nginx::resource::location { '=  /':
-    ensure     => present,
-    server     => ['apt.ocf.berkeley.edu', 'apt'],
-    www_root   => '/opt/apt/ftp',
-    ssl        => true,
-    raw_append => @(END),
-      fancyindex_header README.html;
-      END
+    ensure   => present,
+    server   => ['apt.ocf.berkeley.edu', 'apt'],
+    www_root => '/opt/apt/ftp',
+    ssl      => true,
   }
   nginx::resource::location { '~  /\.(?!well-known).*':
     ensure     => present,

modules/ocf_backups/files/rsnapshot.conf

@@ -53,7 +53,6 @@ backup_script	/opt/share/backups/backup-pgsql	pgsql/
 
 # remote servers
 backup	ocfbackups@hal:/etc/libvirt/qemu/	servers/vm_xml/hal/
-backup	ocfbackups@jaws:/etc/libvirt/qemu/	servers/vm_xml/jaws/
 backup	ocfbackups@pandemic:/etc/libvirt/qemu/	servers/vm_xml/pandemic/
 backup	ocfbackups@riptide:/etc/libvirt/qemu/	servers/vm_xml/riptide/
 backup	ocfbackups@scurvy:/etc/libvirt/qemu/	servers/vm_xml/scurvy/
@@ -69,8 +68,6 @@ backup	ocfbackups@puppet:/opt/puppetlabs/	servers/puppet/
 
 backup	ocfbackups@puppetdb:/etc/puppetlabs/puppet/ssl/	servers/puppetdb/
 
-backup	ocfbackups@munin:/var/lib/munin/	servers/munin/
-
 backup	ocfbackups@apt:/opt/apt/	servers/apt/
 
 backup	ocfbackups@jenkins:/var/lib/jenkins/	servers/jenkins/