holy cats. xml generation's almost done
This commit is contained in:
brent s
11
docs/TODO
11
docs/TODO
@@ -5,8 +5,8 @@
|
||||
- how to support mdadm, lvm?
|
||||
- support serverside "autoconfig"- a mechanism to let servers automatically generate xml build configs. e.g.:
|
||||
kernel ... aif_url="https://build.domain.tld/aif-ng.php" auto=yes
|
||||
would yield the *client* sending info via URL params, e.g.
|
||||
https://build.domain.tld/aif-ng.php?disk[]=sda&disk[]=sdb&disk[sda]=300GB&disk[sdb]=500GB
|
||||
would yield the *client* sending info via URL params (actually, this might be better as a JSON POST, since we already have a way to generate JSON. sort of.),
|
||||
e.g. https://build.domain.tld/aif-ng.php?disk[]=sda&disk[]=sdb&disk[sda]=300GB&disk[sdb]=500GB (can have it so that the autoconfig is only supported clientside if pyyaml is installed)
|
||||
or something like that.
|
||||
- parser: make sure to use https://mikeknoop.com/lxml-xxe-exploit/ fix
|
||||
- convert use of confobj or whatever to maybe be suitable to use webFetch instead. LOTS of duplicated code there.
|
||||
@@ -23,13 +23,14 @@
|
||||
run on /mnt/aif/run type tmpfs (rw,nosuid,nodev,relatime,mode=755)
|
||||
tmp on /mnt/aif/tmp type tmpfs (rw,nosuid,nodev)
|
||||
|
||||
DOCUMENTATION: aif-config.py (and note sample yaml as well)
|
||||
also need to add users, xgroups, etc. etc. etc. into the getOpts
|
||||
DOCUMENTATION: aif-config.py (and note sample json as well)
|
||||
-finish genXML() or whatever i call it
|
||||
-add <mirrorlist><mirror><mirror/><mirrorlist/> support- to both the config run and the XML generator
|
||||
|
||||
also create:
|
||||
-create boot media with bdisk since default arch doesn't even have python 3
|
||||
-- this is.. sort of? done. but iPXE/mini build is failing, need to investigate why
|
||||
|
||||
-- i tihnk i fixed iPXE but i need to generate another one once 1.5 is released
|
||||
docs:
|
||||
http://lxml.de/parsing.html
|
||||
https://www.w3.org/2001/XMLSchema.xsd
|
||||
|
||||
@@ -8,10 +8,12 @@
|
||||
"fmt": "gpt",
|
||||
"parts": {
|
||||
"1": {
|
||||
"fstype": "8300",
|
||||
"start": "0%",
|
||||
"stop": "95%"
|
||||
},
|
||||
"2": {
|
||||
"fstype": "ef00",
|
||||
"start": "95%",
|
||||
"stop": "100%"
|
||||
}
|
||||
@@ -21,14 +23,17 @@
|
||||
"fmt": "gpt",
|
||||
"parts": {
|
||||
"1": {
|
||||
"fstype": "8300",
|
||||
"start": "0%",
|
||||
"stop": "47%"
|
||||
},
|
||||
"2": {
|
||||
"fstype": "8300",
|
||||
"start": "47%",
|
||||
"stop": "95%"
|
||||
},
|
||||
"3": {
|
||||
"fstype": "8200",
|
||||
"start": "95%",
|
||||
"stop": "100%"
|
||||
}
|
||||
@@ -87,6 +92,7 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"scripts": false,
|
||||
"software": {
|
||||
"packages": {
|
||||
"openssh": "None"
|
||||
@@ -130,7 +136,7 @@
|
||||
"kbd": "US",
|
||||
"locale": "en_US.UTF-8",
|
||||
"reboot": true,
|
||||
"rootpass": "$6$0jk/xhwahQHTi5QP$VWTgGlHNdSBDbQmJXUwJPZqajfL3JqYYF7Ghxk3ZSKi12WWXb49KsjR7q0bigvgBBBk5A/mvYES3/qareytFS0",
|
||||
"rootpass": "$6$OeSE5pp4BLWZUn6H$9Y.NO/2cUliOr.apu8qSmgmL4EbGei0u22cw1IANs0h6ek45t8bpHveY7rlHAlljd8PKIxvIRtY9bRCzV24h50",
|
||||
"services": {
|
||||
"sshd": true
|
||||
},
|
||||
@@ -141,7 +147,7 @@
|
||||
"gid": false,
|
||||
"group": false,
|
||||
"home": false,
|
||||
"password": "$6$IlEwDkNmZRuTrT97$vKHjREGspspApBd8aQ/y1S43yRmGMjAzqOmdjNRLWaZyNKqGPrIjMHV9CJc7BzQgU12pRz3cwC6yyc8BDFARu/",
|
||||
"password": "$6$RCL/E8zPTHoYjITS$MsBQ9DXibdRvjE8a0ak8F2OCzShcRg3vKXSyLAipokaIJvTwFWwlLda1MQr6zTzUxlFui.9Ep4k3B8vdRyBX6.",
|
||||
"sudo": true,
|
||||
"uid": false,
|
||||
"xgroups": {
|
||||
@@ -153,4 +159,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,21 @@
|
||||
{'boot': {'efi': True, 'target': '/boot'},
|
||||
'disks': {'/dev/sda': {'fmt': 'gpt',
|
||||
'parts': {1: {'start': '0%', 'stop': '95%'},
|
||||
2: {'start': '95%', 'stop': '100%'}}},
|
||||
'parts': {1: {'fstype': '8300',
|
||||
'start': '0%',
|
||||
'stop': '95%'},
|
||||
2: {'fstype': 'ef00',
|
||||
'start': '95%',
|
||||
'stop': '100%'}}},
|
||||
'/dev/sdb': {'fmt': 'gpt',
|
||||
'parts': {1: {'start': '0%', 'stop': '47%'},
|
||||
2: {'start': '47%', 'stop': '95%'},
|
||||
3: {'start': '95%', 'stop': '100%'}}}},
|
||||
'parts': {1: {'fstype': '8300',
|
||||
'start': '0%',
|
||||
'stop': '47%'},
|
||||
2: {'fstype': '8300',
|
||||
'start': '47%',
|
||||
'stop': '95%'},
|
||||
3: {'fstype': '8200',
|
||||
'start': '95%',
|
||||
'stop': '100%'}}}},
|
||||
'mounts': {1: {'device': '/dev/sda1',
|
||||
'fstype': 'ext4',
|
||||
'opts': 'defaults',
|
||||
@@ -35,7 +45,8 @@
|
||||
'gw': '192.168.1.1',
|
||||
'proto': 'ipv4',
|
||||
'resolvers': ['4.2.2.1', '4.2.2.2']}}},
|
||||
'software': {'packages': {'openssh': 'None'},
|
||||
'scripts': False,
|
||||
'software': {'packages': {'openssh': None},
|
||||
'pkgr': False,
|
||||
'repos': {'community': {'enabled': True,
|
||||
'mirror': 'file:///etc/pacman.d/mirrorlist',
|
||||
@@ -59,14 +70,14 @@
|
||||
'kbd': 'US',
|
||||
'locale': 'en_US.UTF-8',
|
||||
'reboot': True,
|
||||
'rootpass': '$6$0jk/xhwahQHTi5QP$VWTgGlHNdSBDbQmJXUwJPZqajfL3JqYYF7Ghxk3ZSKi12WWXb49KsjR7q0bigvgBBBk5A/mvYES3/qareytFS0',
|
||||
'rootpass': '$6$OeSE5pp4BLWZUn6H$9Y.NO/2cUliOr.apu8qSmgmL4EbGei0u22cw1IANs0h6ek45t8bpHveY7rlHAlljd8PKIxvIRtY9bRCzV24h50',
|
||||
'services': {'sshd': True},
|
||||
'timezone': 'UTC',
|
||||
'users': {'aifusr': {'comment': 'A Test User',
|
||||
'gid': False,
|
||||
'group': False,
|
||||
'home': False,
|
||||
'password': '$6$IlEwDkNmZRuTrT97$vKHjREGspspApBd8aQ/y1S43yRmGMjAzqOmdjNRLWaZyNKqGPrIjMHV9CJc7BzQgU12pRz3cwC6yyc8BDFARu/',
|
||||
'password': '$6$RCL/E8zPTHoYjITS$MsBQ9DXibdRvjE8a0ak8F2OCzShcRg3vKXSyLAipokaIJvTwFWwlLda1MQr6zTzUxlFui.9Ep4k3B8vdRyBX6.',
|
||||
'sudo': True,
|
||||
'uid': False,
|
||||
'xgroups': {'users': {'create': False,
|
||||
|
||||
Reference in New Issue
Block a user