Try using proc for centos override

boxcutter · Sep 26, 2024 · 2ba0fbd · 2ba0fbd
1 parent f79389f
commit 2ba0fbd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/cookbooks/boxcutter_site_settings/recipes/remap_users.rb b/cookbooks/boxcutter_site_settings/recipes/remap_users.rb
@@ -16,12 +16,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if node.centos?
-  FB::Users::GID_MAP.delete('nogroup')
-  FB::Users::GID_MAP['nobody'] = {
-    'gid' => 65534,
-  }
-end
+# if node.centos?
+#   FB::Users::GID_MAP.delete('nogroup')
+#   FB::Users::GID_MAP['nobody'] = {
+#     'gid' => 65534,
+#   }
+# end
 
 FB::Users::UID_MAP.each do |user_name, desired_user_data|
   puts "MISCHA: node['root_user']=#{node['root_user']}, node.root_user=#{node.root_user}"

diff --git a/cookbooks/boxcutter_site_settings/recipes/users.rb b/cookbooks/boxcutter_site_settings/recipes/users.rb
@@ -46,4 +46,14 @@
   'gid' => 'nogroup',
   'home' => '/nonexistent',
   'action' => :add,
+  'only_if' => proc { node.ubuntu? }
+}
+
+node.default['fb_users']['users']['nobody'] = {
+  'comment' => 'Kernel Overflow User',
+  'shell' => '/usr/sbin/nologin',
+  'gid' => '65534',
+  'home' => '/',
+  'action' => :add,
+  'only_if' => proc { node.centos? }
 }
diff --git a/cookbooks/boxcutter_users/libraries/default.rb b/cookbooks/boxcutter_users/libraries/default.rb
@@ -1,6 +1,6 @@
 module FB
   class Users
-    UID_MAP = { # rubocop:disable Style/MutableConstant
+    UID_MAP = {
       # system
       'root' => {
         'uid' => 0,
@@ -48,9 +48,9 @@ class Users
         'uid' => 65534,
         'comment' => 'nobody',
       },
-    }
+    }.freeze
 
-    GID_MAP = { # rubocop:disable Style/MutableConstant
+    GID_MAP = {
       'root' => {
         'gid' => 0,
         'system' => true,