Merge pull request kaorimatz#13 from librenms/tidyup

Tidy up installs
laf · Nov 13, 2018 · 143c446 · 143c446
2 parents 8564e86 + edfa4eb
commit 143c446
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/centos-7.5-x86_64.json b/centos-7.5-x86_64.json
@@ -63,8 +63,7 @@
       "--product", "LibreNMS",
       "--producturl", "https://www.librenms.org",
       "--description", "LibreNMS, a fully featured network monitoring system that provides a wealth of features and device support.",
-      "--version", "LibreNMS",
-      "--eula", "GPLv3"
+      "--version", "LibreNMS"
     ],
     "format": "ova"
   }, {

diff --git a/http/centos-7.5/anaconda-ks.cfg b/http/centos-7.5/anaconda-ks.cfg
@@ -6,7 +6,7 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 rootpw --plaintext CDne3fwdfds
-user --name=librenms --password=CDne3fwdfds --plaintext
+user --name=librenms --password=CDne3fwdfds --plaintext --homedir=/opt/librenms
 zerombr
 clearpart --all --initlabel
 autopart --type=plain

diff --git a/http/ubuntu-18.04/preseed.cfg b/http/ubuntu-18.04/preseed.cfg
@@ -33,5 +33,8 @@ d-i pkgsel/install-language-support boolean false
 ### Boot loader installation
 d-i grub-installer/only_debian boolean true
 
+### Move users homedir
+d-i preseed/late_command string usermod -d /opt/librenms -m librenms
+
 ### Finishing up the installation
 d-i finish-install/reboot_in_progress note
diff --git a/ubuntu-18.04-amd64.json b/ubuntu-18.04-amd64.json
@@ -52,8 +52,7 @@
       "--product", "LibreNMS",
       "--producturl", "https://www.librenms.org",
       "--description", "LibreNMS, a fully featured network monitoring system that provides a wealth of features and device support.",
-      "--version", "LibreNMS",
-      "--eula", "GPLv3"
+      "--version", "LibreNMS"
     ],
     "format": "ova"
   }],
@@ -92,6 +91,7 @@
       "scripts/ubuntu/syslog-ng.sh",
       "scripts/ubuntu/oxidized.sh",
       "scripts/ubuntu/cleanup.sh",
+      "scripts/common/finish.sh",
       "scripts/ubuntu/minimize.sh"
     ]
   }],