fastcloudinit 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

fastcloudinit/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.0.1"
+__version__ = "0.0.3"
 from .core import *

fastcloudinit/_modidx.py

@@ -6,11 +6,13 @@ d = { 'settings': { 'branch': 'main',
                 'git_url': 'https://github.com/AnswerDotAI/fastcloudinit',
                 'lib_path': 'fastcloudinit'},
   'syms': { 'fastcloudinit.core': { 'fastcloudinit.core.apt': ('core.html#apt', 'fastcloudinit/core.py'),
+                                    'fastcloudinit.core.cloud_init_base': ('core.html#cloud_init_base', 'fastcloudinit/core.py'),
                                     'fastcloudinit.core.cloud_init_config': ('core.html#cloud_init_config', 'fastcloudinit/core.py'),
                                     'fastcloudinit.core.log_rotate': ('core.html#log_rotate', 'fastcloudinit/core.py'),
                                     'fastcloudinit.core.mounts': ('core.html#mounts', 'fastcloudinit/core.py'),
                                     'fastcloudinit.core.phone_home': ('core.html#phone_home', 'fastcloudinit/core.py'),
                                     'fastcloudinit.core.reboot': ('core.html#reboot', 'fastcloudinit/core.py'),
+                                    'fastcloudinit.core.runcmd': ('core.html#runcmd', 'fastcloudinit/core.py'),
                                     'fastcloudinit.core.source': ('core.html#source', 'fastcloudinit/core.py'),
                                     'fastcloudinit.core.systemd': ('core.html#systemd', 'fastcloudinit/core.py'),
                                     'fastcloudinit.core.ufw': ('core.html#ufw', 'fastcloudinit/core.py'),

fastcloudinit/core.py

@@ -1,7 +1,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['ufw', 'user', 'source', 'apt', 'systemd', 'log_rotate', 'phone_home', 'reboot', 'mounts', 'cloud_init_config']
+__all__ = ['ufw', 'user', 'source', 'apt', 'systemd', 'log_rotate', 'phone_home', 'reboot', 'mounts', 'runcmd', 'cloud_init_base',
+           'cloud_init_config']
 
 # %% ../nbs/00_core.ipynb
 from fastcore.utils import *
@@ -10,18 +11,18 @@ from textwrap import dedent
 
 # %% ../nbs/00_core.ipynb
 def ufw(logging="off", def_incoming="deny", def_outgoing="allow", internal=None, **allows):
-    rules = [dict(name=k, rule="allow", port=v) for k,v in allows.items()]
-    if internal: rules.append(dict(interface=internal, rule="allow", direction="in"))
-    defaults=dict(incoming=def_incoming, outgoing=def_outgoing)
-    res = dict(enabled=True, logging=logging, defaults=defaults, rules=rules)
-    return dict(ufw=res)
+    cmds = [ f"ufw default {def_incoming} incoming", f"ufw default {def_outgoing} outgoing", f"ufw logging {logging}" ]
+    for name, port in allows.items(): cmds.append("ufw allow {}/tcp".format(port))
+    if internal: cmds.append("ufw allow in on {}".format(internal))
+    cmds.append("ufw --force enable")
+    return cmds
 
 # %% ../nbs/00_core.ipynb
-def user(name, pub_key, groups=None, shell="/bin/bash", sudo=True):
+def user(name, pub_keys, groups=None, shell="/bin/bash", sudo=True):
     groups = listify(groups)
     if sudo and 'sudo' not in groups: groups.append('sudo')
     sudo = ["ALL=(ALL) NOPASSWD:ALL"] if sudo else []
-    return dict(name=name, groups=groups, shell=shell, sudo=sudo, ssh_authorized_keys=[pub_key])
+    return dict(name=name, groups=groups, shell=shell, sudo=sudo, ssh_authorized_keys=listify(pub_keys))
 
 # %% ../nbs/00_core.ipynb
 def source(url, keyid, keyserver):
@@ -45,8 +46,11 @@ Unattended-Upgrade::Automatic-Reboot "{auto_reboot}";
 
 # %% ../nbs/00_core.ipynb
 def systemd(items):
-    units = [dict(name=k, dropin=True, content=v) for k,v in items.items()]
-    return dict(systemd=dict(units=units))
+    return [
+        {'path': f"/etc/systemd/system/{unit_name}.d/override.conf", 
+         'owner': 'root:root',  'permissions': '0644',  'content': content}
+        for unit_name, content in items.items()
+    ]
 
 # %% ../nbs/00_core.ipynb
 def log_rotate(freq="weekly", num_keep=7, fname="00-cloud-init-global"):
@@ -79,19 +83,31 @@ def mounts(devices):
     return dict(mounts=devices)
 
 # %% ../nbs/00_core.ipynb
-def cloud_init_config(hostname, username, ssh_pub_key, email='',
-                      devices=None, ping_host=None, packages=None, **sources):
+def runcmd(cmds):
+    if not cmds: return {}
+    return dict(runcmd=cmds)
+
+# %% ../nbs/00_core.ipynb
+def cloud_init_base(hostname, packages=None, **kw):
     cfg = dict(
         hostname=hostname, preserve_hostname=False,
-        users=[user(username, ssh_pub_key, groups="docker")],
         packages=listify(packages), package_update=True, package_upgrade=True,
-        disable_root=True, ssh_pwauth=False,
-        **ufw(internal="enp7s0", OpenSSH=22),
+        disable_root=True, ssh_pwauth=False, **kw
+    )
+    return "#cloud-config\n" + yaml.safe_dump(cfg, sort_keys=False, width=1_000_000)
+
+# %% ../nbs/00_core.ipynb
+def cloud_init_config(hostname, username, pub_keys, email='', groups=None, internal=None, cmds=None,
+                      devices=None, ping_host=None, packages=None, dropins=None, **sources):
+    cmds = listify(cmds)
+    cmds += ufw(internal=internal, OpenSSH=22)
+    return cloud_init_base(
+        hostname, packages=packages,
+        users=[user(username, pub_keys, groups=groups)],
+        **runcmd(cmds),
         **apt(**sources),
-        **systemd({"systemd-journald.service":"[Journal]\nSystemMaxUse=250M\n"}),
-        write_files=[ log_rotate() ],
+        write_files=[ log_rotate(), *systemd(dropins or {}) ],
         **mounts(devices),
         **phone_home(ping_host),
         **reboot(),
     )
-    return "#cloud-config\n" + yaml.safe_dump(cfg, sort_keys=False, width=1_000_000)

{fastcloudinit-0.0.1.dist-info → fastcloudinit-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcloudinit
-Version: 0.0.1
+Version: 0.0.3
 Summary: Simplified opinionated cloud init for ubuntu
 Home-page: https://github.com/AnswerDotAI/fastcloudinit
 Author: Jeremy Howard

fastcloudinit-0.0.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+fastcloudinit/__init__.py,sha256=DyjzzgRJvp3QnEDlrwpSgOvDRy9Thxh14LVq-rV7GgI,42
+fastcloudinit/_modidx.py,sha256=Wfejm8MTpUUfUqzwtaLDYWPjqaQu81Bi_FdTMW0Heu4,1683
+fastcloudinit/core.py,sha256=fff9PYHv8u1D7UvtDavEXODi_nICf909BccsIZ20R8U,4097
+fastcloudinit-0.0.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fastcloudinit-0.0.3.dist-info/METADATA,sha256=UUgBqHar4bFvZbTraYrExVQ2HuYrwLzgpfE77kVCLVU,1441
+fastcloudinit-0.0.3.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+fastcloudinit-0.0.3.dist-info/entry_points.txt,sha256=VM6Nnsreaik0SzaZUuuwlWvlBKXIt35OXaFWekbNNY8,48
+fastcloudinit-0.0.3.dist-info/top_level.txt,sha256=hVbcvprAQ-MXDFdjn5FkVecIwHYPMUikFR7aRiVHkt4,14
+fastcloudinit-0.0.3.dist-info/RECORD,,

fastcloudinit-0.0.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-fastcloudinit/__init__.py,sha256=XoppFCWM_8XsGAbynKKKg7C3Mca0Kzf_ueJ_7U-l9SE,42
-fastcloudinit/_modidx.py,sha256=SIjb3ukADOIEBqTQq2etF_24_9Ntm-SejvJgpMD7Fw0,1441
-fastcloudinit/core.py,sha256=6K4EBWiSZ5SOMcvPjQux6GIacIXmA-Tyvleb02IhBeU,3663
-fastcloudinit-0.0.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fastcloudinit-0.0.1.dist-info/METADATA,sha256=TVZrKjwG-6uicLfJ9iyp-cYaqNoIsixT2H8VcYHYdVs,1441
-fastcloudinit-0.0.1.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-fastcloudinit-0.0.1.dist-info/entry_points.txt,sha256=VM6Nnsreaik0SzaZUuuwlWvlBKXIt35OXaFWekbNNY8,48
-fastcloudinit-0.0.1.dist-info/top_level.txt,sha256=hVbcvprAQ-MXDFdjn5FkVecIwHYPMUikFR7aRiVHkt4,14
-fastcloudinit-0.0.1.dist-info/RECORD,,