setup to build package for 18.04 (bionic)

changed password generation from makepasswd to openssl
dhis2 · Aug 15, 2018 · 2b8b93a · 2b8b93a
1 parent 41ab0b4
commit 2b8b93a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/src/debian/changelog b/src/debian/changelog
@@ -1,5 +1,5 @@
-dhis2-tools (1.4-xenia) xenial; urgency=low
+dhis2-tools (1.5-bionic) bionic; urgency=low
 
-  * Upstream changes 
+  * Created new package for bionic
 
- -- Bob Jolliffe <[email protected]>  Wed, 08 Mar 2017 18:52:29 +0200
+ -- Bob Jolliffe <[email protected]>  Wed, 15 Aug 2018 06:29:07 +0100
diff --git a/src/debian/control b/src/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: DHIS2 developers <[email protected]>
 Build-Depends: debhelper (>= 8.0.0)
 Standards-Version: 3.9.5
-Homepage: http://launchpad.net/dhis2
+Homepage: https://dhis2.org
 
 Package: dhis2-tools
 Architecture: all
-Depends: postgresql-client,tomcat7-common (>= 7.0.26-1ubuntu1.1),netcat,libtcnative-1,makepasswd,unzip
+Depends: postgresql-client,tomcat8-common,netcat,libtcnative-1,openssl,unzip
 Description: Tools for managing dhis2 on ubuntu
  This package contains a set of tools to assist with
  the installation and maintenance of the dhis2 (http://dhis2.org)

diff --git a/src/debian/copyright b/src/debian/copyright
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2007, University of Oslo
+Copyright (c) 2018, University of Oslo
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/src/debian/install b/src/debian/install
@@ -1,6 +1,5 @@
 /pkg/etc/sudoers.d/dhis2 /etc/sudoers.d/
 /pkg/var/lib/dhis2 /var/lib/
-/pkg/var/log/dhis2 /var/log/
 /pkg/usr/share/dhis2-tools /usr/share/
 /pkg/usr/share/doc/dhis2-tools /usr/share/doc/
 /pkg/usr/share/man/man1/* /usr/share/man/man1/

diff --git a/src/pkg/usr/bin/dhis2-instance-create b/src/pkg/usr/bin/dhis2-instance-create
@@ -125,9 +125,9 @@ echo "Creating system user"
 sudo useradd -m -s /bin/bash -b $DHIS2BASEDIR -c "$TARGET dhis2 instance" -g dhis2 -k $DHIS2SKEL $TARGET
 
 if $CREATEDB; then
-  # create the database user with a strong password. If this hangs: https://goo.gl/gUD3ga
+  # create the database user with a strong password
   echo "Generating password"
-  PASSWORD=$(makepasswd --chars=10)
+  PASSWORD=$(openssl rand -base64 12)
   echo "Creating database role"
   psql postgres -c "CREATE ROLE $TARGET PASSWORD '$PASSWORD' NOSUPERUSER CREATEDB NOCREATEROLE INHERIT LOGIN;"
   # Create the database