fastcloudinit 0.0.2__tar.gz → 0.0.3__tar.gz

{fastcloudinit-0.0.2/fastcloudinit.egg-info → fastcloudinit-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcloudinit
-Version: 0.0.2
+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/fastcloudinit/__init__.py

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

{fastcloudinit-0.0.2 → fastcloudinit-0.0.3}/fastcloudinit/_modidx.py

@@ -12,6 +12,7 @@ d = { 'settings': { 'branch': 'main',
                                     '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-0.0.2 → fastcloudinit-0.0.3}/fastcloudinit/core.py

@@ -1,8 +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',
-           'cloud_init_base']
+__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 *
@@ -11,11 +11,11 @@ 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_keys, groups=None, shell="/bin/bash", sudo=True):
@@ -46,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"):
@@ -80,23 +83,9 @@ def mounts(devices):
     return dict(mounts=devices)
 
 # %% ../nbs/00_core.ipynb
-def cloud_init_config(hostname, username, pub_keys, email='',
-                      devices=None, ping_host=None, packages=None, dropins=None, **sources):
-    if not dropins: dropins={}
-    cfg = dict(
-        hostname=hostname, preserve_hostname=False,
-        users=[user(username, pub_keys, groups="docker")],
-        packages=listify(packages), package_update=True, package_upgrade=True,
-        disable_root=True, ssh_pwauth=False,
-        **ufw(internal="enp7s0", OpenSSH=22),
-        **apt(**sources),
-        **systemd(dropins),
-        write_files=[ log_rotate() ],
-        **mounts(devices),
-        **phone_home(ping_host),
-        **reboot(),
-    )
-    return "#cloud-config\n" + yaml.safe_dump(cfg, sort_keys=False, width=1_000_000)
+def runcmd(cmds):
+    if not cmds: return {}
+    return dict(runcmd=cmds)
 
 # %% ../nbs/00_core.ipynb
 def cloud_init_base(hostname, packages=None, **kw):
@@ -108,15 +97,16 @@ def cloud_init_base(hostname, packages=None, **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,
+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)],
-        **ufw(internal=internal, OpenSSH=22),
+        **runcmd(cmds),
         **apt(**sources),
-        **systemd(dropins or {}),
-        write_files=[ log_rotate() ],
+        write_files=[ log_rotate(), *systemd(dropins or {}) ],
         **mounts(devices),
         **phone_home(ping_host),
         **reboot(),

{fastcloudinit-0.0.2 → fastcloudinit-0.0.3/fastcloudinit.egg-info}/PKG-INFO

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

{fastcloudinit-0.0.2 → fastcloudinit-0.0.3}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fastcloudinit
 lib_name = fastcloudinit
-version = 0.0.2
+version = 0.0.3
 min_python = 3.9
 license = apache2
 black_formatting = False

fastcloudinit-0.0.2/fastcloudinit/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.0.2"
-from .core import *