From 8332caacecfe693046b7188d6943dfbe75baa2a4 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 1 Feb 2019 19:24:24 -0700
Subject: [PATCH] Allow easy configuration of different configs

---
 config/desktop.toml | 304 +++++++++++++++++++++++++++++++++++++++++++
 config/server.toml  | 297 ++++++++++++++++++++++++++++++++++++++++++
 filesystem.toml     | 305 +-------------------------------------------
 3 files changed, 602 insertions(+), 304 deletions(-)
 create mode 100644 config/desktop.toml
 create mode 100644 config/server.toml
 mode change 100644 => 120000 filesystem.toml

diff --git a/config/desktop.toml b/config/desktop.toml
new file mode 100644
index 0000000..c82bd72
--- /dev/null
+++ b/config/desktop.toml
@@ -0,0 +1,304 @@
+# This is the default configuration file
+
+# General settings
+[general]
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+#acid = {}
+audiod = {}
+#autoconf = {}
+#automake = {}
+#bash = {}
+#binutils = {}
+ca-certificates = {}
+#cairo = {}
+#cairodemo = {}
+#cargo = {}
+#cleye = {}
+#cmatrix = {}
+contain = {}
+coreutils = {}
+#cpal = {}
+#curl = {}
+#dash = {}
+#diffutils = {}
+#dosbox = {}
+drivers = {}
+#drivers-041 = {}
+#duktape = {}
+#eduke32 = {}
+#exampled = {}
+#expat = {}
+extrautils = {}
+#fd = {}
+#ffmpeg = {}
+findutils = {}
+#freeciv = {}
+#freedoom = {}
+#freeglut = {}
+#freetype = {}
+#friar = {} # mio patch
+#game-2048 = {}
+#games = {}
+#gawk = {}
+#gcc = {}
+#gears = {}
+#generaluser-gs = {}
+#gettext = {}
+#gigalomania = {}
+#git = {}
+#glib = {}
+#glium = {}
+#glutin = {}
+#gnu-binutils = {}
+#gnu-grep = {}
+#gnu-make = {}
+#gstreamer = {}
+#harfbuzz = {}
+#hematite = {}
+#init = {}
+installer = {}
+ion = {}
+ipcd = {}
+#jansson = {}
+#keyboard-sfx = {}
+#lci = {}
+#libc-bench = {}
+#libffi = {}
+#libiconv = {}
+#libjpeg = {}
+#liborbital = {}
+#libpng = {}
+#libsodium = {}
+#llvm = {}
+logd = {}
+#lua = {}
+#mdp = {}
+#mesa = {}
+#mesa_glu = {}
+#miniserve = {}
+#nasm = {}
+#ncdu = {}
+#ncurses = {}
+#ncursesw = {}
+netdb = {}
+netstack = {}
+netsurf = {}
+netutils = {}
+#newlib = {}
+#newlibtest = {}
+nulld = {}
+#openjazz = {}
+#openssl = {}
+#openttd = {}
+#openttd-opengfx = {}
+#openttd-openmsx = {}
+#openttd-opensfx = {}
+orbdata = {}
+orbital = {}
+orbterm = {}
+orbutils = {}
+#osdemo = {}
+#pastel = {}
+#patch = {}
+#pcre = {}
+#periodictable = {}
+#perl = {}
+#pixelcannon = {}
+#pixman = {}
+pkgutils = {}
+#powerline = {}
+#prboom = {}
+ptyd = {}
+#python = {}
+#qemu = {}
+randd = {}
+#readline = {} # ncurses
+redoxfs = {}
+#redox-ssh = {}
+#relibc = {}
+#ripgrep = {}
+#rodioplay = {}
+#rs-nes = {}
+#rust = {}
+#rust64 = {}
+#rust-cairo = {}
+#rust-cairo-demo = {}
+#rustual-boy = {}
+#schismtracker = {}
+#scummvm = {}
+#sdl = {}
+#sdl2 = {}
+#sdl_gfx = {}
+#sdl_image = {}
+#sdl_mixer = {}
+#sdl_ttf = {}
+#sdl-player = {}
+#sed = {}
+#servo = {}
+#shellstorm = {}
+smith = {}
+#sodium = {}
+#sopwith = {}
+#ssh = {}
+#syobonaction = {}
+#terminfo = {}
+#termplay = {}
+#timidity = {}
+#ttf-hack = {}
+userutils = {}
+uutils = {}
+#vim = {}
+#vttest = {}
+#webrender = {}
+#winit = {}
+#xz = {}
+zerod = {}
+#zlib = {}
+
+# User settings
+[users.root]
+password = "password"
+uid = 0
+gid = 0
+name = "root"
+home = "/root"
+
+[users.user]
+# Password is unset
+password = ""
+
+[[files]]
+path = "/etc/init.d/00_base"
+data = """
+nulld
+zerod
+randd
+ipcd
+logd
+ptyd
+pcid /etc/pcid/filesystem.toml
+"""
+
+[[files]]
+path = "/etc/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd -b
+"""
+
+[[files]]
+path = "/etc/init.d/20_orbital"
+data = """
+audiod
+orbital display:3/activate orblogin launcher
+"""
+
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+getty display:2
+getty debug: -J
+"""
+
+[[files]]
+path = "/etc/net/dns"
+data = """
+208.67.222.222
+"""
+
+[[files]]
+path = "/etc/net/ip"
+data = """
+10.0.2.15
+"""
+
+[[files]]
+path = "/etc/net/ip_router"
+data = """
+10.0.2.2
+"""
+
+[[files]]
+path = "/etc/net/ip_subnet"
+data = """
+255.255.255.0
+"""
+
+[[files]]
+path = "/etc/net/mac"
+data = """
+54-52-00-ab-cd-ef
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"
+
+[[files]]
+path = "/etc/group"
+data = """
+root;0;root
+user;1000;user
+sudo;1;user
+"""
+
+[[files]]
+path = "/etc/hostname"
+data = """
+redox
+"""
+
+[[files]]
+path = "/etc/issue"
+data = """
+########## Redox OS ##########
+# Login with the following:  #
+# `user`                     #
+# `root`:`password`          #
+##############################
+
+"""
+
+[[files]]
+path = "/etc/motd"
+data = """
+Welcome to Redox OS!
+
+"""
+
+[[files]]
+path = "/usr/bin"
+data = "/bin"
+symlink = true
+
+[[files]]
+path = "/usr/games"
+data = "/games"
+symlink = true
+
+[[files]]
+path = "/usr/include"
+data = "/include"
+symlink = true
+
+[[files]]
+path = "/usr/lib"
+data = "/lib"
+symlink = true
+
+[[files]]
+path = "/usr/share"
+data = "/share"
+symlink = true
+
+[[files]]
+path = "/tmp"
+data = ""
+directory= true
+# 0o1777
+mode = 1023
diff --git a/config/server.toml b/config/server.toml
new file mode 100644
index 0000000..0e785fe
--- /dev/null
+++ b/config/server.toml
@@ -0,0 +1,297 @@
+# This is the default configuration file
+
+# General settings
+[general]
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+#acid = {}
+#audiod = {}
+#autoconf = {}
+#automake = {}
+#bash = {}
+#binutils = {}
+ca-certificates = {}
+#cairo = {}
+#cairodemo = {}
+#cargo = {}
+#cleye = {}
+#cmatrix = {}
+contain = {}
+coreutils = {}
+#cpal = {}
+#curl = {}
+#dash = {}
+#diffutils = {}
+#dosbox = {}
+drivers = {}
+#drivers-041 = {}
+#duktape = {}
+#eduke32 = {}
+#exampled = {}
+#expat = {}
+extrautils = {}
+#fd = {}
+#ffmpeg = {}
+findutils = {}
+#freeciv = {}
+#freedoom = {}
+#freeglut = {}
+#freetype = {}
+#friar = {} # mio patch
+#game-2048 = {}
+#games = {}
+#gawk = {}
+#gcc = {}
+#gears = {}
+#generaluser-gs = {}
+#gettext = {}
+#gigalomania = {}
+#git = {}
+#glib = {}
+#glium = {}
+#glutin = {}
+#gnu-binutils = {}
+#gnu-grep = {}
+#gnu-make = {}
+#gstreamer = {}
+#harfbuzz = {}
+#hematite = {}
+#init = {}
+installer = {}
+ion = {}
+ipcd = {}
+#jansson = {}
+#keyboard-sfx = {}
+#lci = {}
+#libc-bench = {}
+#libffi = {}
+#libiconv = {}
+#libjpeg = {}
+#liborbital = {}
+#libpng = {}
+#libsodium = {}
+#llvm = {}
+logd = {}
+#lua = {}
+#mdp = {}
+#mesa = {}
+#mesa_glu = {}
+#miniserve = {}
+#nasm = {}
+#ncdu = {}
+#ncurses = {}
+#ncursesw = {}
+netdb = {}
+netstack = {}
+netsurf = {}
+netutils = {}
+#newlib = {}
+#newlibtest = {}
+nulld = {}
+#openjazz = {}
+#openssl = {}
+#openttd = {}
+#openttd-opengfx = {}
+#openttd-openmsx = {}
+#openttd-opensfx = {}
+#orbdata = {}
+#orbital = {}
+#orbterm = {}
+#orbutils = {}
+#osdemo = {}
+#pastel = {}
+#patch = {}
+#pcre = {}
+#periodictable = {}
+#perl = {}
+#pixelcannon = {}
+#pixman = {}
+pkgutils = {}
+#powerline = {}
+#prboom = {}
+ptyd = {}
+#python = {}
+#qemu = {}
+randd = {}
+#readline = {} # ncurses
+redoxfs = {}
+#redox-ssh = {}
+#relibc = {}
+#ripgrep = {}
+#rodioplay = {}
+#rs-nes = {}
+#rust = {}
+#rust64 = {}
+#rust-cairo = {}
+#rust-cairo-demo = {}
+#rustual-boy = {}
+#schismtracker = {}
+#scummvm = {}
+#sdl = {}
+#sdl2 = {}
+#sdl_gfx = {}
+#sdl_image = {}
+#sdl_mixer = {}
+#sdl_ttf = {}
+#sdl-player = {}
+#sed = {}
+#servo = {}
+#shellstorm = {}
+smith = {}
+#sodium = {}
+#sopwith = {}
+#ssh = {}
+#syobonaction = {}
+#terminfo = {}
+#termplay = {}
+#timidity = {}
+#ttf-hack = {}
+userutils = {}
+uutils = {}
+#vim = {}
+#vttest = {}
+#webrender = {}
+#winit = {}
+#xz = {}
+zerod = {}
+#zlib = {}
+
+# User settings
+[users.root]
+password = "password"
+uid = 0
+gid = 0
+name = "root"
+home = "/root"
+
+[users.user]
+# Password is unset
+password = ""
+
+[[files]]
+path = "/etc/init.d/00_base"
+data = """
+nulld
+zerod
+randd
+ipcd
+logd
+ptyd
+pcid /etc/pcid/filesystem.toml
+"""
+
+[[files]]
+path = "/etc/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd -b
+"""
+
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+getty display:2/activate
+getty debug: -J
+"""
+
+[[files]]
+path = "/etc/net/dns"
+data = """
+208.67.222.222
+"""
+
+[[files]]
+path = "/etc/net/ip"
+data = """
+10.0.2.15
+"""
+
+[[files]]
+path = "/etc/net/ip_router"
+data = """
+10.0.2.2
+"""
+
+[[files]]
+path = "/etc/net/ip_subnet"
+data = """
+255.255.255.0
+"""
+
+[[files]]
+path = "/etc/net/mac"
+data = """
+54-52-00-ab-cd-ef
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"
+
+[[files]]
+path = "/etc/group"
+data = """
+root;0;root
+user;1000;user
+sudo;1;user
+"""
+
+[[files]]
+path = "/etc/hostname"
+data = """
+redox
+"""
+
+[[files]]
+path = "/etc/issue"
+data = """
+########## Redox OS ##########
+# Login with the following:  #
+# `user`                     #
+# `root`:`password`          #
+##############################
+
+"""
+
+[[files]]
+path = "/etc/motd"
+data = """
+Welcome to Redox OS!
+
+"""
+
+[[files]]
+path = "/usr/bin"
+data = "/bin"
+symlink = true
+
+[[files]]
+path = "/usr/games"
+data = "/games"
+symlink = true
+
+[[files]]
+path = "/usr/include"
+data = "/include"
+symlink = true
+
+[[files]]
+path = "/usr/lib"
+data = "/lib"
+symlink = true
+
+[[files]]
+path = "/usr/share"
+data = "/share"
+symlink = true
+
+[[files]]
+path = "/tmp"
+data = ""
+directory= true
+# 0o1777
+mode = 1023
diff --git a/filesystem.toml b/filesystem.toml
deleted file mode 100644
index c82bd72..0000000
--- a/filesystem.toml
+++ /dev/null
@@ -1,304 +0,0 @@
-# This is the default configuration file
-
-# General settings
-[general]
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-#acid = {}
-audiod = {}
-#autoconf = {}
-#automake = {}
-#bash = {}
-#binutils = {}
-ca-certificates = {}
-#cairo = {}
-#cairodemo = {}
-#cargo = {}
-#cleye = {}
-#cmatrix = {}
-contain = {}
-coreutils = {}
-#cpal = {}
-#curl = {}
-#dash = {}
-#diffutils = {}
-#dosbox = {}
-drivers = {}
-#drivers-041 = {}
-#duktape = {}
-#eduke32 = {}
-#exampled = {}
-#expat = {}
-extrautils = {}
-#fd = {}
-#ffmpeg = {}
-findutils = {}
-#freeciv = {}
-#freedoom = {}
-#freeglut = {}
-#freetype = {}
-#friar = {} # mio patch
-#game-2048 = {}
-#games = {}
-#gawk = {}
-#gcc = {}
-#gears = {}
-#generaluser-gs = {}
-#gettext = {}
-#gigalomania = {}
-#git = {}
-#glib = {}
-#glium = {}
-#glutin = {}
-#gnu-binutils = {}
-#gnu-grep = {}
-#gnu-make = {}
-#gstreamer = {}
-#harfbuzz = {}
-#hematite = {}
-#init = {}
-installer = {}
-ion = {}
-ipcd = {}
-#jansson = {}
-#keyboard-sfx = {}
-#lci = {}
-#libc-bench = {}
-#libffi = {}
-#libiconv = {}
-#libjpeg = {}
-#liborbital = {}
-#libpng = {}
-#libsodium = {}
-#llvm = {}
-logd = {}
-#lua = {}
-#mdp = {}
-#mesa = {}
-#mesa_glu = {}
-#miniserve = {}
-#nasm = {}
-#ncdu = {}
-#ncurses = {}
-#ncursesw = {}
-netdb = {}
-netstack = {}
-netsurf = {}
-netutils = {}
-#newlib = {}
-#newlibtest = {}
-nulld = {}
-#openjazz = {}
-#openssl = {}
-#openttd = {}
-#openttd-opengfx = {}
-#openttd-openmsx = {}
-#openttd-opensfx = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-#osdemo = {}
-#pastel = {}
-#patch = {}
-#pcre = {}
-#periodictable = {}
-#perl = {}
-#pixelcannon = {}
-#pixman = {}
-pkgutils = {}
-#powerline = {}
-#prboom = {}
-ptyd = {}
-#python = {}
-#qemu = {}
-randd = {}
-#readline = {} # ncurses
-redoxfs = {}
-#redox-ssh = {}
-#relibc = {}
-#ripgrep = {}
-#rodioplay = {}
-#rs-nes = {}
-#rust = {}
-#rust64 = {}
-#rust-cairo = {}
-#rust-cairo-demo = {}
-#rustual-boy = {}
-#schismtracker = {}
-#scummvm = {}
-#sdl = {}
-#sdl2 = {}
-#sdl_gfx = {}
-#sdl_image = {}
-#sdl_mixer = {}
-#sdl_ttf = {}
-#sdl-player = {}
-#sed = {}
-#servo = {}
-#shellstorm = {}
-smith = {}
-#sodium = {}
-#sopwith = {}
-#ssh = {}
-#syobonaction = {}
-#terminfo = {}
-#termplay = {}
-#timidity = {}
-#ttf-hack = {}
-userutils = {}
-uutils = {}
-#vim = {}
-#vttest = {}
-#webrender = {}
-#winit = {}
-#xz = {}
-zerod = {}
-#zlib = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-nulld
-zerod
-randd
-ipcd
-logd
-ptyd
-pcid /etc/pcid/filesystem.toml
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/etc/issue"
-data = """
-########## Redox OS ##########
-# Login with the following:  #
-# `user`                     #
-# `root`:`password`          #
-##############################
-
-"""
-
-[[files]]
-path = "/etc/motd"
-data = """
-Welcome to Redox OS!
-
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "/bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "/games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "/include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "/lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "/share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
diff --git a/filesystem.toml b/filesystem.toml
new file mode 120000
index 0000000..1b8536b
--- /dev/null
+++ b/filesystem.toml
@@ -0,0 +1 @@
+config/desktop.toml
\ No newline at end of file