using the custom resource

axelerant · Jul 21, 2014 · a63157e · a63157e
1 parent 104b1cb
commit a63157e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 47 deletions.
diff --git a/base/providers/default.rb b/base/providers/default.rb
@@ -6,7 +6,7 @@
     owner node['goatos']['user']
     group node['goatos']['user']
     mode 0644
-    source '#{new_resource.name}'
+    source '#{new_resource.name}.erb'
     variables(
       u_start: u_start,
       u_range: u_range,

diff --git a/base/recipes/configure.rb b/base/recipes/configure.rb
@@ -2,60 +2,66 @@
   action :install
 end
 
-require 'sshkey'
-
-u_start, u_range = ::File.read('/etc/subuid').scan(/goatos:(\d+):(\d+)/).flatten
-g_start, g_range = ::File.read('/etc/subgid').scan(/goatos:(\d+):(\d+)/).flatten
-
-template '/opt/goatos/.config/lxc/default.conf' do
-  owner node['goatos']['user']
-  group node['goatos']['group']
-  mode 0644
-  source 'lxc.conf.erb'
-  variables(
-    u_start: u_start,
-    u_range: u_range,
-    g_start: g_start,
-    g_range: g_range
-  )
+base 'lxc.conf' do
+  title "lxc.conf"
+  path '/opt/goatos/.config/lxc/default.conf'
+  action :create
 end
 
-template '/opt/goatos/.local/share/lxc/lamp-template/config' do
-  owner node['goatos']['user']
-  group node['goatos']['group']
-  mode 0644
-  source 'lamp.conf.erb'
-  variables(
-    u_start: u_start,
-    u_range: u_range,
-    g_start: g_start,
-    g_range: g_range
-  )
-end
+#require 'sshkey'
+
+#u_start, u_range = ::File.read('/etc/subuid').scan(/goatos:(\d+):(\d+)/).flatten
+#g_start, g_range = ::File.read('/etc/subgid').scan(/goatos:(\d+):(\d+)/).flatten
+
+#template '/opt/goatos/.config/lxc/default.conf' do
+#  owner node['goatos']['user']
+#  group node['goatos']['group']
+#  mode 0644
+#  source 'lxc.conf.erb'
+#  variables(
+#    u_start: u_start,
+#    u_range: u_range,
+#    g_start: g_start,
+#    g_range: g_range
+#  )
+#end
+
+#template '/opt/goatos/.local/share/lxc/lamp-template/config' do
+#  owner node['goatos']['user']
+#  group node['goatos']['group']
+#  mode 0644
+#  source 'lamp.conf.erb'
+#  variables(
+#    u_start: u_start,
+#    u_range: u_range,
+#    g_start: g_start,
+#    g_range: g_range
+#  )
+#end
 
 #execute "chown-rootfs" do
 #  command "chown #{u_start}:#{g_start} /opt/goatos/.local/share/lxc/lamp-template/rootfs -R"
 #end
 
 
-unless ::File.exist?('/opt/goatos/.ssh/authorized_keys')
-  k = SSHKey.generate
-  file '/opt/goatos/.ssh/authorized_keys' do
-    owner node['goatos']['user']
-    group node['goatos']['group']
-    mode 0400
-    content k.ssh_public_key
-  end
-  node.set['goatos']['sshkey'] = k.private_key
-end
+#unless ::File.exist?('/opt/goatos/.ssh/authorized_keys')
+#  k = SSHKey.generate
+#  file '/opt/goatos/.ssh/authorized_keys' do
+#    owner node['goatos']['user']
+#    group node['goatos']['group']
+#    mode 0400
+#    content k.ssh_public_key
+#  end
+#  node.set['goatos']['sshkey'] = k.private_key
+#end
 
-git "/opt/goatos/.ssh/admin-keys" do
-  repository "https://github.com/axelerant/admin-keys.git"
-  revision "master"
-  action :sync
-end
+#git "/opt/goatos/.ssh/admin-keys" do
+#  repository "https://github.com/axelerant/admin-keys.git"
+#  revision "master"
+#  action :sync
+#end
 
-execute "combine-keys" do
-  command "cat /opt/goatos/.ssh/admin-keys/keys >> /opt/goatos/.ssh/authorized_keys"
-end
+#execute "combine-keys" do
+#  command "cat /opt/goatos/.ssh/admin-keys/keys >> /opt/goatos/.ssh/authorized_keys"
+#end