v-perlbrew.patch

commit e13d33346f14b0c1f6253f14609553029c164cdf
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Thu May 20 16:42:54 2010 +0000

    Add v-perlbrew user
    
    This user is to manage the v perl installation, replacing Debian's

diff --git a/group b/group
index 25d0fae..7ecf9f0 100644
--- a/group
+++ b/group
@@ -63,3 +63,4 @@ tomcat6:x:119:
 hex:x:1003:
 dovecot:x:120:
 osm-mirror:x:1005:
+v-perlbrew:x:1006:avar,hinrik
diff --git a/passwd b/passwd
index e8efb0f..1595335 100644
--- a/passwd
+++ b/passwd
@@ -41,3 +41,4 @@ tomcat6:x:113:119::/usr/share/tomcat6:/bin/false
 hex:x:1006:1003:Earle Martin,,,:/home/hex:/bin/bash
 dovecot:x:114:120:Dovecot mail server,,,:/usr/lib/dovecot:/bin/false
 osm-mirror:x:1009:1005:OpenStreetMap GitHub mirror,,,:/home/osm-mirror:/bin/bash
+v-perlbrew:x:1010:1006:Perlbrew user for v.nix.is,,,:/home/v-perlbrew:/bin/bash

commit cc8806e6067f7022324151cd84a41d29fb5d1ba7
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Thu May 20 17:21:41 2010 +0000

    use v-perlbrew for root

diff --git a/users/root/.bashrc b/users/root/.bashrc
new file mode 100644
index 0000000..afd7e58
--- /dev/null
+++ b/users/root/.bashrc
@@ -0,0 +1,4 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+. ~v-perlbrew/perl5/perlbrew/etc/bashrc
+export PS1='\h:\w\$ '
+umask 022

commit b9c3b022f6fda5a288d99afed93df38f66d183d4
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Thu May 20 17:27:51 2010 +0000

    use perlbrew for v-perlbrew

diff --git a/users/v-perlbrew/.bashrc b/users/v-perlbrew/.bashrc
index e96b37f..5a6ffd6 100644
--- a/users/v-perlbrew/.bashrc
+++ b/users/v-perlbrew/.bashrc
@@ -2,6 +2,8 @@
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
 # for examples
 
+. ~v-perlbrew/perl5/perlbrew/etc/bashrc
+
 # If not running interactively, don't do anything
 [ -z "$PS1" ] && return
 

commit 7c1fe5e0cecc9f03825781fb582305b5b871dd71
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Tue May 25 19:16:43 2010 +0000

    Make failo use the perlbrew installation

diff --git a/users/failo/.bashrc b/users/failo/.bashrc
new file mode 100644
index 0000000..afd7e58
--- /dev/null
+++ b/users/failo/.bashrc
@@ -0,0 +1,4 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+. ~v-perlbrew/perl5/perlbrew/etc/bashrc
+export PS1='\h:\w\$ '
+umask 022

commit 08c5c7c31731cd4b743a3adcfa1d5b5ba6991b86
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Tue May 25 21:48:11 2010 +0000

    Use v-perlbrew's perl to run failo-wisdom update

diff --git a/cron.d/v-failo-wisdom b/cron.d/v-failo-wisdom
index 3ee9284..0640ba5 100644
--- a/cron.d/v-failo-wisdom
+++ b/cron.d/v-failo-wisdom
@@ -1,2 +1,3 @@
-PATH=/usr/bin:/usr/local/bin
+PATH=/usr/bin:/home/v-perlbrew/perl5/perlbrew/bin:/home/v-perlbrew/perl5/perlbrew/perls/current/bin
+
 4 * * * * failo nice -n 15 ionice -c 2 -n 6 /etc/bin/cron/failo-wisdom-update

commit 87f89d07bf8abfbe2072f3fe156f647726fa58bc
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Tue May 25 22:15:11 2010 +0000

    Use v-perlbrew's perl for osm.nix.is

diff --git a/cron.d/v-osm-nix-is b/cron.d/v-osm-nix-is
index 5eb409c..7c11dc6 100644
--- a/cron.d/v-osm-nix-is
+++ b/cron.d/v-osm-nix-is
@@ -1,3 +1,5 @@
+PATH=/usr/bin:/home/v-perlbrew/perl5/perlbrew/bin:/home/v-perlbrew/perl5/perlbrew/perls/current/bin
+
 ##
 ## avar's daily mkgmap generation
 ##

commit 7fe3fc49e56c977c1a704787a717bb5d98afc839
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Tue May 25 22:22:02 2010 +0000

    Run Twatterhose with v-perlbrew's Perl

diff --git a/cron.d/v-twitter-twatterhose b/cron.d/v-twitter-twatterhose
index 7e62445..2560374 100644
--- a/cron.d/v-twitter-twatterhose
+++ b/cron.d/v-twitter-twatterhose
@@ -1,5 +1,5 @@
 SHELL=/bin/bash
-PATH=/bin:/usr/bin:/usr/local/bin
+PATH=/home/v-perlbrew/perl5/perlbrew/bin:/home/v-perlbrew/perl5/perlbrew/perls/current/bin:/bin:/usr/bin
 
 */35 * * * * avar (sleep $(($RANDOM \% 600))) && /etc/bin/cron/twatterhose-twat
 @daily       avar rm ~/g/bot-twatterhose/twatterhose.brn

commit 96de955e9c65dc531247bb12e7bfc2634a5a6595
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Wed May 26 12:27:14 2010 +0000

    Make sure permissions for the ~v-perlbrew/perl5 tree are OK

diff --git a/cron.d/v-perlbrew-perl5-permissions b/cron.d/v-perlbrew-perl5-permissions
new file mode 100644
index 0000000..b269793
--- /dev/null
+++ b/cron.d/v-perlbrew-perl5-permissions
@@ -0,0 +1,2 @@
+@daily root chmod g+rw ~v-perlbrew/perl5/
+@daily root chown -R v-perlbrew:v-perlbrew ~v-perlbrew/perl5

commit fb1accb76fbf9ba114d5e3d54cf1bf346dbbac97
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Wed May 26 14:41:13 2010 +0000

    Set apache envvars to use v-perlbrew's perl

diff --git a/apache2/envvars b/apache2/envvars
index ea5804c..603e957 100644
--- a/apache2/envvars
+++ b/apache2/envvars
@@ -31,3 +31,6 @@ export LANG
 ## The command to get the status for 'apache2ctl status'.
 ## Some packages providing 'www-browser' need '--dump' instead of '-dump'.
 #export APACHE_LYNX='www-browser -dump'
+
+# Use v-perlbrew's perl
+export PATH=/home/v-perlbrew/perl5/perlbrew/bin:/home/v-perlbrew/perl5/perlbrew/perls/current/bin:/bin:/usr/bin

commit 8f206f7375c4afbad02b9b38665db3d8ae956503
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Fri Jun 11 21:26:41 2010 +0000

    v-perlbrew: Explicitly use /home/v-perlbrew/perl5/perlbrew/bin/perl instead of /usr/bin/env perl for munin plugins's Perl
    
    The default $PATH is hardcoded in bash or something else that I can't
    configure. So I need to hardcode the shebang if I want to run the
    v-perlbrew perl.

diff --git a/munin/our-plugins/apt_installed_packages b/munin/our-plugins/apt_installed_packages
index 7901ac9..8c61c1d 100755
--- a/munin/our-plugins/apt_installed_packages
+++ b/munin/our-plugins/apt_installed_packages
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use perl5i::latest;
 
 given ($ARGV[0]) {
diff --git a/munin/our-plugins/cpanp_o b/munin/our-plugins/cpanp_o
index f4f39ed..739c66f 100755
--- a/munin/our-plugins/cpanp_o
+++ b/munin/our-plugins/cpanp_o
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use perl5i::latest;
 use File::Spec::Functions qw(catfile);
 
diff --git a/munin/our-plugins/dirs_ b/munin/our-plugins/dirs_
index 8eebbec..22ada1a 100755
--- a/munin/our-plugins/dirs_
+++ b/munin/our-plugins/dirs_
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use perl5i::latest;
 use Munin::Plugin;
 use File::Slurp qw(slurp);
diff --git a/munin/our-plugins/hailo_ b/munin/our-plugins/hailo_
index 05e8970..c7df191 100755
--- a/munin/our-plugins/hailo_
+++ b/munin/our-plugins/hailo_
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use 5.010;
 use autodie;
 use Any::Moose;
diff --git a/munin/our-plugins/memory_user b/munin/our-plugins/memory_user
index 9af5454..f8f65ce 100755
--- a/munin/our-plugins/memory_user
+++ b/munin/our-plugins/memory_user
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use perl5i::latest;
 use Munin::Plugin;
 
diff --git a/munin/our-plugins/multiping_async b/munin/our-plugins/multiping_async
index 11da5e1..e113cce 100755
--- a/munin/our-plugins/multiping_async
+++ b/munin/our-plugins/multiping_async
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 package Munin::Plugin::Multiping::Async;
 use 5.10.0;
 use MooseX::POE;
diff --git a/munin/our-plugins/munin_stats_plugins b/munin/our-plugins/munin_stats_plugins
index fd7b1c0..2f6115a 100755
--- a/munin/our-plugins/munin_stats_plugins
+++ b/munin/our-plugins/munin_stats_plugins
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use perl5i::latest;
 use Munin::Plugin;
 use File::Slurp qw(slurp);
diff --git a/munin/our-plugins/netstat_listen_ b/munin/our-plugins/netstat_listen_
index 752eed2..179a288 100755
--- a/munin/our-plugins/netstat_listen_
+++ b/munin/our-plugins/netstat_listen_
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use perl5i::latest;
 use Munin::Plugin;
 
diff --git a/munin/our-plugins/osm_apidb_primitive_count_ b/munin/our-plugins/osm_apidb_primitive_count_
index 45db35d..fc58126 100755
--- a/munin/our-plugins/osm_apidb_primitive_count_
+++ b/munin/our-plugins/osm_apidb_primitive_count_
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use 5.010;
 use strict;
 use lib '/etc/munin/our-plugins';
diff --git a/munin/our-plugins/osm_apidb_primitive_tag_count_ b/munin/our-plugins/osm_apidb_primitive_tag_count_
index 21e1f01..e2c8501 100755
--- a/munin/our-plugins/osm_apidb_primitive_tag_count_
+++ b/munin/our-plugins/osm_apidb_primitive_tag_count_
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use 5.010;
 use strict;
 use lib '/etc/munin/our-plugins';
diff --git a/munin/our-plugins/osm_apidb_tags_ b/munin/our-plugins/osm_apidb_tags_
index a9c45e8..8034e13 100755
--- a/munin/our-plugins/osm_apidb_tags_
+++ b/munin/our-plugins/osm_apidb_tags_
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use 5.010;
 use strict;
 use Munin::Plugin;
diff --git a/munin/our-plugins/osm_apidb_user_count_ b/munin/our-plugins/osm_apidb_user_count_
index c96e3c1..ba2d1e8 100755
--- a/munin/our-plugins/osm_apidb_user_count_
+++ b/munin/our-plugins/osm_apidb_user_count_
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use 5.010;
 use strict;
 use Munin::Plugin;
diff --git a/munin/our-plugins/rtom_queue_archive_size b/munin/our-plugins/rtom_queue_archive_size
index 4e12d04..f81c27f 100755
--- a/munin/our-plugins/rtom_queue_archive_size
+++ b/munin/our-plugins/rtom_queue_archive_size
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use perl5i::latest;
 
 given ($ARGV[0]) {
diff --git a/munin/our-plugins/vnstat_month b/munin/our-plugins/vnstat_month
index 6c868e8..304794f 100755
--- a/munin/our-plugins/vnstat_month
+++ b/munin/our-plugins/vnstat_month
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/home/v-perlbrew/perl5/perlbrew/bin/perl
+use lib '/usr/share/perl5';
 use 5.010;
 use strict;
 use warnings;

commit 7b6c42446ef37ce430e98fdffd3b90a36a026332
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date:   Fri Jun 11 21:47:43 2010 +0000

    v-perlbrew: run the osm github mirror with perlbrew's perl

diff --git a/cron.d/v-openstreetmap-github-mirror b/cron.d/v-openstreetmap-github-mirror
index 01fa922..e02ad6b 100644
--- a/cron.d/v-openstreetmap-github-mirror
+++ b/cron.d/v-openstreetmap-github-mirror
@@ -1,6 +1,6 @@
 # OpenStreetMap mirrors
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/home/v-perlbrew/perl5/perlbrew/bin:/home/v-perlbrew/perl5/perlbrew/perls/current/bin:/bin:/usr/bin
 
 # JOSM is a special case
 */30 * * * * osm-mirror nice -n 15 ionice -c 2 -n 6 cronjob -E -j josm -c '~/g/openstreetmap-mirror/josm-mirror.sh'