From bdf51952e84c949b2a214593abd522337c1fc16f Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@canonical.com>
Date: Mon, 10 Aug 2009 21:39:35 +0200
Subject: Move ec2-config file to top-level.

---
 debian/ec2-config.cfg | 2 --
 ec2-config.cfg        | 2 ++
 setup.py              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 debian/ec2-config.cfg
 create mode 100644 ec2-config.cfg

diff --git a/debian/ec2-config.cfg b/debian/ec2-config.cfg
deleted file mode 100644
index 76c81b77..00000000
--- a/debian/ec2-config.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-user="ubuntu"
-DISABLE_ROOT="1"
diff --git a/ec2-config.cfg b/ec2-config.cfg
new file mode 100644
index 00000000..76c81b77
--- /dev/null
+++ b/ec2-config.cfg
@@ -0,0 +1,2 @@
+user="ubuntu"
+DISABLE_ROOT="1"
diff --git a/setup.py b/setup.py
index e199eb1b..33a82d14 100755
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setup(name='EC2-init',
                'ec2-set-defaults.py',
                'ec2-set-hostname.py',
                'ec2-wait-for-meta-data-service.py'],
-      data_files=[('/etc/ec2-init', ['debian/ec2-config.cfg']),
+      data_files=[('/etc/ec2-init', ['ec2-config.cfg']),
                   ('/etc/ec2-init/templates', glob('templates/*')),
                   ('/etc/init.d', ['ec2-init'])],
       )
-- 
cgit v1.2.3