Remocing rsa keys from puppet repo

Sergio Oliveira
1 parent dd52c6ea
Showing 4 changed files with 19 additions and 47 deletions Show diff stats
puppet/modules/colab/files/root_id_rsa
puppet/modules/colab/files/root_id_rsa.pub
puppet/modules/colab/manifests/cronjobs.pp
puppet/modules/colab/manifests/init.pp
@@ -1,28 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAuCnJ7elkn0ZoMiZZIbZ8wigD1gcMwKyTVrPfnel9eNK9c/8R
-6QsE6xrNoNQmjTsbGJF88RZkz7cYxX9YFIXatL+Wckq+GUirWMUm/2zIR8rqo31X
-l/0E/nXWED3k9L3ZZwB3PzY15vDhkt+Gv+zpdYQkL6Jj23IAeDM1Q5/cq3Ha2z5l
-1L0z7wN+rttfE879Jxv7plC3ceVzm7jj5aYRH2dZFgkjgr3DmAI0fh+15To4apkQ
-fw/tvGPfogIDRhQybts5UvY2UnK4/ize+IswBTgTlNV864bLqpkgcY8drdX04Kxu
-34qBG1FGtj4MDP3kjJdoFOolV4vn+5nGQ0A6awIDAQABAoIBAGO7ZbpskWxb8aNu
-9wf1znxKtUEb0kEpdCUZBfl7b9KVtblyoZ1ltUUo38DAAxyqrJLSfyoEaZW/Xy/d
-NbLvhjAqLOw6I9aHbxuEsQjUPWX7srPU9jG9+Q1gfQuQqUQM6AYKz4kw72HggxhJ
-6qxXPVrBs+MD+zXk9/IgMTEtCpDhDVNdy1bEsiguEeUFOIvDCDqN4DN1iWy5i1Xn
-aJTYp/JPbGqohp9XJ1vQPhQin5s0el21OxW61xJRR12Y2VAxKpmwXC5SdAT+z7bY
-k2TXbujyP68MZKmnruhouRy5gtFwZpehGgoycuBWrwG2S2iEvJy7AsPFe90wEbQb
-4xYjOtkCgYEA30jPvOurvRyM5Kpl6zhN9E1x4kqtuJsuRvGCqXfQtVZXD2b6hkGF
-PHKVsCUco9t+86ZQZ2xoyMDuLxEelCnbktX0P8RfH/e1CqADo3NIxkd+vJsS/PYo
-wEUcEYFaTKEzJJaG1ZApf4m14scSeMvirTy3sfVyZRWhcHRB9hLknncCgYEA0yWU
-HMGC57GMXO3Wc0Bs7oaC2N7WbPk+reQ4rVxVLu1qOtpkzwpfwUFQBqn7LIpIX9Jc
-B3MFOe9ndA5jNRwECMPoMd1d9t+OkTjf3cpiPwludph/cReIho1bouW2xzuR7XO0
-J1dLnmeYCKZQ1lKysK0bGbkRoXAz6yzK8oBc/K0CgYBV7YpstPF5rLQYB++DDz8I
-xokOQhkK00WC7cyP9VkvgBOvDL1az3o74gjzKcUU1hLMJ3QH6TOGFqFTIa537Ifg
-wU/m/mZxQf29IglkbKhUDg2a/b7X9M+H9tCvd+1NUjgBW6B2La2atF93746PSD9q
-1dQHu2KTvjhLs6Hy1iB/TwKBgQCmLU4rb5VSOmdJABqmbE8PTygN/Rtvep59B0Ag
-GKomG85ecWGjnPuNwpR0GjXHcTHS0GGDr1+uoB+gtG4Z72mxaFYHYLzCPmIbI1L1
-YIIAMLESf6TVYfseQoSbaQV4Ogb4hfaEe+zUx51dOWAnvcBK0oKgtQoOL5t8/Kzh
-PGtypQKBgQDfMeSWp6Xztv3EAoBpuh6+T5nfcqEJ7FgkddxBVxDCJCOljDjZrjOk
-YR3Yz7n3hN/0OfXxByL+EnP3EL3sIiIvc/IKxw3E2faU8iPXWyXmYbL/vHDs5+BX
-h29DcOwAoANga1DxlQrJ6uGSb4yKkxaamTIJJMSJ5G9UUf90ie3Y2w==
------END RSA PRIVATE KEY-----
-
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4Kcnt6WSfRmgyJlkhtnzCKAPWBwzArJNWs9+d6X140r1z/xHpCwTrGs2g1CaNOxsYkXzxFmTPtxjFf1gUhdq0v5ZySr4ZSKtYxSb/bMhHyuqjfVeX/QT+ddYQPeT0vdlnAHc/NjXm8OGS34a/7Ol1hCQvomPbcgB4MzVDn9yrcdrbPmXUvTPvA36u218Tzv0nG/umULdx5XObuOPlphEfZ1kWCSOCvcOYAjR+H7XlOjhqmRB/D+28Y9+iAgNGFDJu2zlS9jZScrj+LN74izAFOBOU1XzrhsuqmSBxjx2t1fTgrG7fioEbUUa2PgwM/eSMl2gU6iVXi+f7mcZDQDpr demouser@demoserver
@@ -47,7 +47,7 @@ class colab::cronjobs {
     user    => 'root',
     require => [
         File['/mnt/mailman/archives/'],
-        File['root-ssh-private-key'],
+        #File['root-ssh-private-key'],
         Package['sshfs'],
     ],
   }
@@ -51,23 +51,24 @@ class colab {
     path   => '/root/.ssh',
   }
  
-  file { 'root-ssh-private-key':
-    ensure  => present,
-    mode    => '0600',
-    path    => '/root/.ssh/id_rsa',
-    source  => 'puppet:///modules/colab/root_id_rsa',
-    owner   => root,
-    group   => root,
-  }
-
-  file { 'root-ssh-public-key':
-    ensure  => present,
-    mode    => '0644',
-    path    => '/root/.ssh/id_rsa.pub',
-    source  => 'puppet:///modules/colab/root_id_rsa.pub',
-    owner   => root,
-    group   => root,
-  }
+  # Should generate instead of copying
+  #file { 'root-ssh-private-key':
+  #  ensure  => present,
+  #  mode    => '0600',
+  #  path    => '/root/.ssh/id_rsa',
+  #  source  => 'puppet:///modules/colab/root_id_rsa',
+  #  owner   => root,
+  #  group   => root,
+  #}
+
+  #file { 'root-ssh-public-key':
+  #  ensure  => present,
+  #  mode    => '0644',
+  #  path    => '/root/.ssh/id_rsa.pub',
+  #  source  => 'puppet:///modules/colab/root_id_rsa.pub',
+  #  owner   => root,
+  #  group   => root,
+  #}
  
   supervisor::app { 'colab':
     command   => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application -c colab/gunicorn.conf.py',
...	...	@@ -1,28 +0,0 @@
1		------BEGIN RSA PRIVATE KEY-----
2		-MIIEpAIBAAKCAQEAuCnJ7elkn0ZoMiZZIbZ8wigD1gcMwKyTVrPfnel9eNK9c/8R
3		-6QsE6xrNoNQmjTsbGJF88RZkz7cYxX9YFIXatL+Wckq+GUirWMUm/2zIR8rqo31X
4		-l/0E/nXWED3k9L3ZZwB3PzY15vDhkt+Gv+zpdYQkL6Jj23IAeDM1Q5/cq3Ha2z5l
5		-1L0z7wN+rttfE879Jxv7plC3ceVzm7jj5aYRH2dZFgkjgr3DmAI0fh+15To4apkQ
6		-fw/tvGPfogIDRhQybts5UvY2UnK4/ize+IswBTgTlNV864bLqpkgcY8drdX04Kxu
7		-34qBG1FGtj4MDP3kjJdoFOolV4vn+5nGQ0A6awIDAQABAoIBAGO7ZbpskWxb8aNu
8		-9wf1znxKtUEb0kEpdCUZBfl7b9KVtblyoZ1ltUUo38DAAxyqrJLSfyoEaZW/Xy/d
9		-NbLvhjAqLOw6I9aHbxuEsQjUPWX7srPU9jG9+Q1gfQuQqUQM6AYKz4kw72HggxhJ
10		-6qxXPVrBs+MD+zXk9/IgMTEtCpDhDVNdy1bEsiguEeUFOIvDCDqN4DN1iWy5i1Xn
11		-aJTYp/JPbGqohp9XJ1vQPhQin5s0el21OxW61xJRR12Y2VAxKpmwXC5SdAT+z7bY
12		-k2TXbujyP68MZKmnruhouRy5gtFwZpehGgoycuBWrwG2S2iEvJy7AsPFe90wEbQb
13		-4xYjOtkCgYEA30jPvOurvRyM5Kpl6zhN9E1x4kqtuJsuRvGCqXfQtVZXD2b6hkGF
14		-PHKVsCUco9t+86ZQZ2xoyMDuLxEelCnbktX0P8RfH/e1CqADo3NIxkd+vJsS/PYo
15		-wEUcEYFaTKEzJJaG1ZApf4m14scSeMvirTy3sfVyZRWhcHRB9hLknncCgYEA0yWU
16		-HMGC57GMXO3Wc0Bs7oaC2N7WbPk+reQ4rVxVLu1qOtpkzwpfwUFQBqn7LIpIX9Jc
17		-B3MFOe9ndA5jNRwECMPoMd1d9t+OkTjf3cpiPwludph/cReIho1bouW2xzuR7XO0
18		-J1dLnmeYCKZQ1lKysK0bGbkRoXAz6yzK8oBc/K0CgYBV7YpstPF5rLQYB++DDz8I
19		-xokOQhkK00WC7cyP9VkvgBOvDL1az3o74gjzKcUU1hLMJ3QH6TOGFqFTIa537Ifg
20		-wU/m/mZxQf29IglkbKhUDg2a/b7X9M+H9tCvd+1NUjgBW6B2La2atF93746PSD9q
21		-1dQHu2KTvjhLs6Hy1iB/TwKBgQCmLU4rb5VSOmdJABqmbE8PTygN/Rtvep59B0Ag
22		-GKomG85ecWGjnPuNwpR0GjXHcTHS0GGDr1+uoB+gtG4Z72mxaFYHYLzCPmIbI1L1
23		-YIIAMLESf6TVYfseQoSbaQV4Ogb4hfaEe+zUx51dOWAnvcBK0oKgtQoOL5t8/Kzh
24		-PGtypQKBgQDfMeSWp6Xztv3EAoBpuh6+T5nfcqEJ7FgkddxBVxDCJCOljDjZrjOk
25		-YR3Yz7n3hN/0OfXxByL+EnP3EL3sIiIvc/IKxw3E2faU8iPXWyXmYbL/vHDs5+BX
26		-h29DcOwAoANga1DxlQrJ6uGSb4yKkxaamTIJJMSJ5G9UUf90ie3Y2w==
27		------END RSA PRIVATE KEY-----
28		-
...	...	@@ -1 +0,0 @@
1		-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4Kcnt6WSfRmgyJlkhtnzCKAPWBwzArJNWs9+d6X140r1z/xHpCwTrGs2g1CaNOxsYkXzxFmTPtxjFf1gUhdq0v5ZySr4ZSKtYxSb/bMhHyuqjfVeX/QT+ddYQPeT0vdlnAHc/NjXm8OGS34a/7Ol1hCQvomPbcgB4MzVDn9yrcdrbPmXUvTPvA36u218Tzv0nG/umULdx5XObuOPlphEfZ1kWCSOCvcOYAjR+H7XlOjhqmRB/D+28Y9+iAgNGFDJu2zlS9jZScrj+LN74izAFOBOU1XzrhsuqmSBxjx2t1fTgrG7fioEbUUa2PgwM/eSMl2gU6iVXi+f7mcZDQDpr demouser@demoserver
...	...	@@ -47,7 +47,7 @@ class colab::cronjobs {
47	47	user => 'root',
48	48	require => [
49	49	File['/mnt/mailman/archives/'],
50		- File['root-ssh-private-key'],
	50	+ #File['root-ssh-private-key'],
51	51	Package['sshfs'],
52	52	],
53	53	}
...	...
...	...	@@ -51,23 +51,24 @@ class colab {
51	51	path => '/root/.ssh',
52	52	}
53	53
54		- file { 'root-ssh-private-key':
55		- ensure => present,
56		- mode => '0600',
57		- path => '/root/.ssh/id_rsa',
58		- source => 'puppet:///modules/colab/root_id_rsa',
59		- owner => root,
60		- group => root,
61		- }
62		-
63		- file { 'root-ssh-public-key':
64		- ensure => present,
65		- mode => '0644',
66		- path => '/root/.ssh/id_rsa.pub',
67		- source => 'puppet:///modules/colab/root_id_rsa.pub',
68		- owner => root,
69		- group => root,
70		- }
	54	+ # Should generate instead of copying
	55	+ #file { 'root-ssh-private-key':
	56	+ # ensure => present,
	57	+ # mode => '0600',
	58	+ # path => '/root/.ssh/id_rsa',
	59	+ # source => 'puppet:///modules/colab/root_id_rsa',
	60	+ # owner => root,
	61	+ # group => root,
	62	+ #}
	63	+
	64	+ #file { 'root-ssh-public-key':
	65	+ # ensure => present,
	66	+ # mode => '0644',
	67	+ # path => '/root/.ssh/id_rsa.pub',
	68	+ # source => 'puppet:///modules/colab/root_id_rsa.pub',
	69	+ # owner => root,
	70	+ # group => root,
	71	+ #}
71	72
72	73	supervisor::app { 'colab':
73	74	command => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application -c colab/gunicorn.conf.py',
...	...