Patchwork [meta-webserver,1/2] webmin: allow override of webmin login and password

login
register
mail settings
Submitter Anders Darander
Date June 13, 2014, 1:01 p.m.
Message ID <875fa96599ceb347572e1d7830e6386c4d0e8419.1402664272.git.anders@chargestorm.se>
Download mbox | patch
Permalink /patch/73757/
State Accepted, archived
Headers show

Comments

Anders Darander - June 13, 2014, 1:01 p.m.
Don't hardcode the webmin login and password in the install script.
Instead, extract them to variables, to allow us to override them in
a bbappend.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
index 8822b92..a561de2 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
@@ -65,6 +65,9 @@  do_configure() {
     sed -i "s/find_pid_command=.*/find_pid_command=pidof NAME/" config-generic-linux
 }
 
+WEBMIN_LOGIN ?= "admin"
+WEBMIN_PASSWORD ?= "password"
+
 do_install() {
     install -d ${D}${sysconfdir}
     install -d ${D}${sysconfdir}/webmin
@@ -92,8 +95,8 @@  do_install() {
     export real_os_type="${DISTRO_NAME}"
     export real_os_version="${DISTRO_VERSION}"
     export port=10000
-    export login=admin
-    export password=password
+    export login=${WEBMIN_LOGIN}
+    export password=${WEBMIN_PASSWORD}
     export ssl=0
     export atboot=1
     export no_pam=1