From 3de6a6fcf5241e17781afb7413f3694b9530d19d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 28 Sep 2014 18:05:13 -0400
Subject: mv bin/postfix-{show,generate}-virtual-map

---
 Makefile                         |  2 +-
 bin/postfix-generate-virtual-map | 21 +++++++++++++++++++++
 bin/postfix-show-virtual-map     | 21 ---------------------
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100755 bin/postfix-generate-virtual-map
 delete mode 100755 bin/postfix-show-virtual-map

diff --git a/Makefile b/Makefile
index c407c71..d99b3d7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ postfix-virtual-map: PHONY output/postfix-virtual-map/virtual-parabola.nu
 
 output/postfix-virtual-map/virtual-parabola.nu: ${users}
 	${MKDIRS} ${@D}
-	bin/postfix-show-virtual-map > $@
+	bin/postfix-generate-virtual-map > $@
 
 ####
 
diff --git a/bin/postfix-generate-virtual-map b/bin/postfix-generate-virtual-map
new file mode 100755
index 0000000..1203c63
--- /dev/null
+++ b/bin/postfix-generate-virtual-map
@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# Usage: postfix-show-virtual-map > ${file} && postmap hash:${file}
+cfg_groups = [ "hackers", "fellows" ]
+
+######################################################################
+require 'yaml'
+
+users = Dir.glob("users/*.yml").map{|f|YAML::load(open(f))}
+	.find_all{|u|u["groups"] and not (u["groups"] & cfg_groups).empty?}
+
+users.each do |user|
+	if user["email"] and user["email"].length > 0
+		if user["email"][0] =~ /.*@parabola.nu$/
+			if user["email"].length > 1
+				puts "#{user["username"]}@parabola.nu  #{user["email"][1]}"
+			end
+		else
+			puts "#{user["username"]}@parabola.nu  #{user["email"][0]}"
+		end
+	end
+end
diff --git a/bin/postfix-show-virtual-map b/bin/postfix-show-virtual-map
deleted file mode 100755
index 1203c63..0000000
--- a/bin/postfix-show-virtual-map
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: postfix-show-virtual-map > ${file} && postmap hash:${file}
-cfg_groups = [ "hackers", "fellows" ]
-
-######################################################################
-require 'yaml'
-
-users = Dir.glob("users/*.yml").map{|f|YAML::load(open(f))}
-	.find_all{|u|u["groups"] and not (u["groups"] & cfg_groups).empty?}
-
-users.each do |user|
-	if user["email"] and user["email"].length > 0
-		if user["email"][0] =~ /.*@parabola.nu$/
-			if user["email"].length > 1
-				puts "#{user["username"]}@parabola.nu  #{user["email"][1]}"
-			end
-		else
-			puts "#{user["username"]}@parabola.nu  #{user["email"][0]}"
-		end
-	end
-end
-- 
cgit v1.1-4-g5e80