manager: fix path to templates and files. Import templates.

manifests/manager.pp

@@ -47,7 +47,7 @@
 
     "${apt_dater::manager_ad_conf_dir}/apt-dater.conf":
       ensure  => 'file',
-      content => template('apt/apt-dater.conf.erb'),
+      content => template('apt_dater/apt-dater.conf.erb'),
       mode    => '0600',
       owner   => $apt_dater::manager_user,
       require => File[$apt_dater::manager_ad_conf_dir];
@@ -61,22 +61,22 @@
 
     "${apt_dater::manager_ad_conf_dir}/screenrc":
       ensure  => 'file',
-      content => template('apt/apt-dater-screenrc.erb'),
+      content => template('apt_dater/apt-dater-screenrc.erb'),
       mode    => '0600',
       owner   => $apt_dater::manager_user,
       require => File[$apt_dater::manager_ad_conf_dir];
 
     '/usr/local/bin/update-apt-dater-hosts':
       ensure  => 'file',
-      content => template('apt/update-apt-dater-hosts.erb'),
+      content => template('apt_dater/update-apt-dater-hosts.erb'),
       mode    => '0755',
       owner   => root,
       group   => root,
       notify  => Exec['update-hosts.conf'];
 
     $apt_dater::manager_fragments_dir:
       ensure  => 'directory',
-      source  => 'puppet:///modules/apt/empty',
+      source  => 'puppet:///modules/apt_dater/empty',
       mode    => '0700',
       owner   => $apt_dater::manager_user,
       recurse => true,

templates/apt-dater-screenrc.erb

@@ -0,0 +1,63 @@
+# ------------------------------------------------------------------------------
+# SCREEN SETTINGS
+# ------------------------------------------------------------------------------
+
+startup_message off
+
+#defflow on # will force screen to process ^S/^Q
+deflogin on
+autodetach on
+
+# turn visual bell on
+vbell on
+
+# define a bigger scrollback, default is 100 lines
+defscrollback 2048
+
+# ------------------------------------------------------------------------------
+# SCREEN KEYBINDINGS
+# ------------------------------------------------------------------------------
+
+# Remove some stupid / dangerous key bindings
+bind ^k
+#bind L
+bind ^\
+# Make them better
+bind \\ quit
+bind K kill
+bind I login on
+bind O login off
+bind } history
+
+# Sessions should stay until destroyed by pressing q
+zombie 'q'
+
+# ------------------------------------------------------------------------------
+# TERMINAL SETTINGS
+# ------------------------------------------------------------------------------
+
+# The vt100 description does not mention "dl". *sigh*
+termcapinfo vt100 dl=5\E[M
+
+# Set the hardstatus prop on gui terms to set the titlebar/icon title
+termcapinfo xterm*|rxvt*|kterm*|Eterm* hs:ts=\E]0;:fs=\007:ds=\E]0;\007:OP
+
+# set these terminals up to be 'optimal' instead of vt100
+#termcapinfo xterm*|linux*|rxvt*|Eterm* OP
+
+# Change the xterm initialization string from is2=\E[!p\E[?3;4l\E[4l\E>
+# (This fixes the "Aborted because of window size change" konsole symptoms found
+#  in bug #134198)
+termcapinfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
+
+# To get screen to add lines to xterm's scrollback buffer, uncomment the
+# following termcapinfo line which tells xterm to use the normal screen buffer
+# (which has scrollback), not the alternate screen buffer.
+#
+termcapinfo xterm|xterms|xs|rxvt ti@:te@
+
+# Add caption line with clock, window title and window flags.
+caption always "%{b bG}%c%=%t%=%f"
+
+# Catch zmodem file transfers
+zmodem catch

templates/apt-dater.conf.erb

@@ -0,0 +1,53 @@
+# Managed by puppet
+# Config file of apt-dater in the form of the glib GKeyFile required
+
+[Paths]
+# Default: $XDG_CONFIG_HOME/apt-dater/hosts.conf
+#HostsFile=path-to/hosts.conf
+
+# Default: $XDG_DATA_HOME/apt-dater
+#StatsDir=path-to/stats
+
+[SSH]
+# SSH binary
+Cmd=/usr/bin/ssh
+<% if scope.lookupvar('apt::dater::reuse_ssh') -%>
+OptionalCmdFlags=-t
+<% else -%> 
+OptionalCmdFlags=-t -i <%= scope.lookupvar('apt::dater::manager_ssh_private_file') %>
+<% end -%> 
+
+# SFTP binary
+SFTPCmd=/usr/bin/sftp
+
+#[Screen]
+## Default: $XDG_CONFIG_HOME/apt-dater/screenrc
+#RCFile=path-to/screenrc
+#
+## Default: %m # %u@%h:%p
+#Title=%m # %U%H
+#
+
+# These values requires apt-dater-host to be installed on the target host.
+# You could call apt/aptitude directly (see apt-dater-host source),
+# but this is not recommended.
+[Commands]
+CmdRefresh=apt-dater-host refresh
+CmdUpgrade=apt-dater-host upgrade
+CmdInstall=apt-dater-host install %s
+
+[Appearance]
+# Colors      = (COMPONENT FG BG ';')*
+# COMPONENT ::= 'default' | 'menu' | 'status' | 'selector' | 'hoststatus' |
+#               'query' | 'input'
+# FG        ::= COLOR
+# BG        ::= COLOR
+# COLOR     ::= 'black' | 'blue' | 'cyan' | 'green' | 'magenta' | 'red' |
+#               'white' | 'yellow'
+Colors=menu brightgreen blue;status brightgreen blue;selector black red;
+
+#[TCLFilter]
+#Predefined filter expression on startup.
+#FilterExp=return [expr [string compare $lsb_distri "Debian"] == 0 && $lsb_rel < 5.0]
+#Load this TCL file on startup in the same context as the FilterExp.
+#FilterFile=/patch/to/file.tcl

templates/update-apt-dater-hosts.erb

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+find "<%= scope.lookupvar('apt::dater::manager_fragments_dir') %>" -maxdepth 1 -xdev -type f \
+	| perl -ne '
+		chomp;
+		/\/([^\/]*):([^\/]*):([^\/]*)$/;
+		my ($customer, $host, $port) = ($1, $2, $3);
+		# print "c=$customer, h=$host, p=$port\n";
+		push @{ $hosts{$customer} }, "$host:$port";
+		END {
+			# use Data::Dumper; print Dumper(\%hosts);
+			foreach $customer (sort keys %hosts) {
+				print "[$customer]\n";
+				print "Hosts=", join( ";", @{ $hosts{$customer} }), "\n\n";
+			}
+		}'
+