浏览代码

Add all debian repositories on a separate cookbooks

Signed-off-by: Jeremy MAURO <jeremy.mauro@gmail.com>
Jeremy MAURO 2 年之前
父节点
当前提交
a3bf14b0a1

+ 33 - 2
base.lock.json

@@ -15,7 +15,7 @@
     ],
     "apt": [
       "recipe[workstation::_resolver]",
-      "recipe[workstation::_apt]"
+      "recipe[apt_repositories::_official]"
     ],
     "genie": [
       "recipe[workstation::_resolver]",
@@ -23,7 +23,7 @@
     ],
     "packages": [
       "recipe[workstation::_resolver]",
-      "recipe[workstation::_apt]",
+      "recipe[apt_repositories::_official]",
       "recipe[workstation::_packages]"
     ]
   },
@@ -31,6 +31,26 @@
 
   ],
   "cookbook_locks": {
+    "apt_repositories": {
+      "version": "0.1.0",
+      "identifier": "e368c3f81c58ea9e61d71f7e194a127d5cbf0544",
+      "dotted_decimal_identifier": "64010010603837674.44580622894504266.20329636234564",
+      "source": "cookbooks/apt_repositories",
+      "cache_key": null,
+      "scm_info": {
+        "scm": "git",
+        "remote": null,
+        "revision": "5d2590c383e0ca6db1e143aa562de61878051113",
+        "working_tree_clean": false,
+        "published": false,
+        "synchronized_remote_branches": [
+
+        ]
+      },
+      "source_options": {
+        "path": "cookbooks/apt_repositories"
+      }
+    },
     "ark": {
       "version": "6.0.4",
       "identifier": "dc2c6c730cb7a74869039cd07d9e2d9c80df6924",
@@ -125,6 +145,10 @@
   },
   "solution_dependencies": {
     "Policyfile": [
+      [
+        "apt_repositories",
+        "= 0.1.0"
+      ],
       [
         "ark",
         "= 6.0.4"
@@ -151,6 +175,9 @@
       ]
     ],
     "dependencies": {
+      "apt_repositories (0.1.0)": [
+
+      ],
       "ark (6.0.4)": [
         [
           "seven_zip",
@@ -187,6 +214,10 @@
         [
           "resolver",
           ">= 0.0.0"
+        ],
+        [
+          "apt_repositories",
+          ">= 0.0.0"
         ]
       ]
     }

+ 1 - 1
base.rb

@@ -27,7 +27,7 @@ named_run_list :git, [
 
 named_run_list :apt, [
   'workstation::_resolver',
-  'workstation::_apt',
+  'apt_repositories::_official',
 ]
 
 named_run_list :genie, [

+ 23 - 0
cookbooks/apt_repositories/recipes/_genie.rb

@@ -0,0 +1,23 @@
+#
+# Cookbook:: workstation
+# Recipe:: _podman
+#
+# Copyright:: 2022, The Authors, All Rights Reserved.
+
+package 'lsb-release'
+
+key_path = '/etc/apt/trusted.gpg.d'
+gpg_key = ::File.join(key_path, 'wsl-transdebian.gpg')
+remote_file gpg_key do
+  source 'https://arkane-systems.github.io/wsl-transdebian/apt/wsl-transdebian.gpg'
+  action :create_if_missing
+end
+
+apt_repository 'wsl_transdebian' do
+  arch 'amd64'
+  uri 'https://arkane-systems.github.io/wsl-transdebian/apt/'
+  distribution lazy { Mixlib::ShellOut.new('lsb_release -cs').run_command.stdout.chomp }
+  components ['main']
+  deb_src true
+  action :add
+end

+ 0 - 0
cookbooks/workstation/recipes/_apt.rb → cookbooks/apt_repositories/recipes/_official.rb


+ 0 - 12
cookbooks/workstation/recipes/_podman.rb → cookbooks/apt_repositories/recipes/_podman.rb

@@ -37,15 +37,3 @@ directory '/etc/containers/containers.conf.d' do
   mode '0755'
   action :create
 end
-
-file '/etc/containers/containers.conf.d/99wsl2.conf' do
-  owner 'root'
-  group 'root'
-  mode '0755'
-  content <<~_WSL2
-    [engine]
-    cgroup_manager = "cgroupfs"
-    events_logger = "file"
-  _WSL2
-  action :create
-end

+ 1 - 0
cookbooks/workstation/metadata.rb

@@ -14,6 +14,7 @@ chef_version '>= 16.0'
 depends 'etckeeper'
 depends 'git'
 depends 'resolver'
+depends 'apt_repositories'
 
 # The `source_url` points to the development repository for this cookbook.  A
 # `View Source` link will be displayed on this cookbook's page when uploaded to

+ 1 - 4
cookbooks/workstation/recipes/default.rb

@@ -12,10 +12,7 @@ chef_handler 'Chef::Handler::JsonFile' do
 end
 
 # Configure repo
-include_recipe 'workstation::_apt'
-
-# Setup 'git'
-include_recipe 'workstation::_git'
+include_recipe 'apt_repositories::_official'
 
 # Setup podman
 include_recipe 'workstation::_podman'