Merge lp:~sidnei/juju-core/lxc-config-perms into lp:~go-bot/juju-core/trunk

[Sidnei da Silva]

Fix default perms on apt config

Installing the config with mode 0600 makes it impossible for a non-root user
to run any apt command.

https://codereview.appspot.com/12510043/

R=axwalk, thumper

Fix default perms on apt config

Installing the config with mode 0600 makes it impossible for a non-root user
to run any apt command.

https://codereview.appspot.com/12510043/

[Sidnei da Silva (sidnei)]

Reviewers: mp+178672_code.launchpad.net,

Message:
Please take a look.

Description:
Fix default perms on apt config

Installing the config with mode 0600 makes it impossible for a non-root
user
to run any apt command.

https://code.launchpad.net/~sidnei/juju-core/lxc-config-perms/+merge/178672

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/12510043/

Affected files:
   A [revision details]
   M container/lxc/lxc.go
   M container/lxc/lxc_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20130806053414-fbcxuyvncbfz3m8n
+New revision: <email address hidden>

Index: container/lxc/lxc.go
=== modified file 'container/lxc/lxc.go'
--- container/lxc/lxc.go 2013-08-05 17:45:38 +0000
+++ container/lxc/lxc.go 2013-08-06 07:40:45 +0000
@@ -365,7 +365,7 @@
     cloudConfig.AddFile(
      "/etc/apt/apt.conf.d/99proxy-extra",
      strings.Join(proxyLines, "\n"),
- 0600)
+ 0644)
    }
   }

Index: container/lxc/lxc_test.go
=== modified file 'container/lxc/lxc_test.go'
--- container/lxc/lxc_test.go 2013-08-05 17:38:28 +0000
+++ container/lxc/lxc_test.go 2013-08-06 07:40:45 +0000
@@ -123,7 +123,7 @@

   c.Assert(scripts[len(scripts)-4:], gc.DeepEquals, []string{
    "start jujud-machine-1-lxc-0",
- "install -m 600 /dev/null '/etc/apt/apt.conf.d/99proxy-extra'",
+ "install -m 644 /dev/null '/etc/apt/apt.conf.d/99proxy-extra'",
    fmt.Sprintf("echo '%s' > '/etc/apt/apt.conf.d/99proxy-extra'",
configProxyExtra),
    "ifconfig",
   })

[Tim Penhey (thumper)]

LGTM - trivial

https://codereview.appspot.com/12510043/

[Andrew Wilkins (axwalk)]

On 2013/08/06 07:42:52, sidnei.da.silva wrote:
> Please take a look.

LGTM, trivial.

https://codereview.appspot.com/12510043/

=== modified file 'container/lxc/lxc.go'
--- container/lxc/lxc.go	2013-08-05 17:45:38 +0000
+++ container/lxc/lxc.go	2013-08-06 07:43:29 +0000
@@ -365,7 +365,7 @@
 			cloudConfig.AddFile(
 				"/etc/apt/apt.conf.d/99proxy-extra",
 				strings.Join(proxyLines, "\n"),
-				0600)
+				0644)
 		}
 	}
 

=== modified file 'container/lxc/lxc_test.go'
--- container/lxc/lxc_test.go	2013-08-05 17:38:28 +0000
+++ container/lxc/lxc_test.go	2013-08-06 07:43:29 +0000
@@ -123,7 +123,7 @@
 
 	c.Assert(scripts[len(scripts)-4:], gc.DeepEquals, []string{
 		"start jujud-machine-1-lxc-0",
-		"install -m 600 /dev/null '/etc/apt/apt.conf.d/99proxy-extra'",
+		"install -m 644 /dev/null '/etc/apt/apt.conf.d/99proxy-extra'",
 		fmt.Sprintf("echo '%s' > '/etc/apt/apt.conf.d/99proxy-extra'", configProxyExtra),
 		"ifconfig",
 	})