Ready for release..

PolaricServer · Sep 23, 2021 · b3fae02 · b3fae02
1 parent e3c6978
commit b3fae02
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 11 deletions.
diff --git a/Changelog b/Changelog
@@ -311,3 +311,16 @@ V.2.7
 * Various fixes..
 
 
+V.2.8
+-----
+* Libraries - use newer versions.
+* Allow suspending of user access
+* Support for role based authorisation (groups) and per item authorisation
+* Filter script updates
+* Auto backup of some important files
+* Encryption of usernames in remotectl protocol
+* Various fixes..
+
+
+
+
diff --git a/Makefile b/Makefile
@@ -56,6 +56,7 @@ install: polaric-aprsd.jar
 	install -d $(INSTALL_SUDO)
 	install -m 755 -d $(INSTALL_LOG)
 	install -m 644 passwd $(INSTALL_CONFIG)
+	install -m 644 groups $(INSTALL_CONFIG)
 	install -m 644 server.ini $(INSTALL_CONFIG)
 	install -m 644 scripts.conf $(INSTALL_CONFIG)
 	install -m 644 symbols $(INSTALL_CONFIG)
@@ -65,6 +66,7 @@ install: polaric-aprsd.jar
 	install -m 644 polaric-aprsd.jar $(INSTALL_JAR)
 	install -m 644 images/* $(INSTALL_WEB)/images
 	install -m 644 style.css $(INSTALL_WEB)
+	install -m 755 polaric-checkfilter $(INSTALL_BIN)
 	install -m 755 polaric-restart $(INSTALL_BIN)
 	install -m 755 polaric-passwd $(INSTALL_BIN)
 	install -m 755 polaric-aprsd-start $(INSTALL_BIN)

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,13 @@
-polaric-aprsd (2.7+) UNRELEASED; urgency=medium
+polaric-aprsd (2.8) stable; urgency=medium
 
-  * Hacking..
+  * Encryption of usernames in remotectl protocol
+  * Support for role based authorisation (groups) and per item authorisation
+  * Filter script updates
+  * Auto backup of some important files
+  * Libraries - use newer versions.
+  * Various fixes..
 
- -- Oyvind Hanssen <ohanssen@acm.org>  Sun, 09 May 2021 11:53:41 +0200
+ -- Oyvind Hanssen <ohanssen@acm.org>  Mon, 20 Sep 2021 11:51:31 +0200
 
 polaric-aprsd (2.7) stable; urgency=medium
 

diff --git a/debian/control b/debian/control
@@ -9,9 +9,9 @@ Homepage: http://aprs.no/polaricserver
 Package: polaric-aprsd
 Architecture: all
 Depends: openjdk-11-jre-headless|openjdk-12-jre-headless|openjdk-13-headless|openjdk-14-headless|openjdk-15-headless, libslf4j-java, librxtx-java, scala-library (>> 2.11.12), scala-xml, scala-parser-combinators, gettext-base, libgettext-commons-java, libcommons-codec-java, libjackson2-core-java, libjackson2-databind-java, adduser, apache2-utils, sudo, lsb-base, ${misc:Depends}
-Conflicts: polaric-database-plugin (<= 2.1), polaric-ais-plugin (<= 2.1.0) 
+Conflicts: polaric-database-plugin (<= 2.6), polaric-ais-plugin (<= 2.1.0) 
 Recommends:
-Suggests: polaric-webapp2 (>= 1.6)
+Suggests: polaric-webapp2 (>= 1.7)
 Description: Polaric Server: APRS daemon part. 
  The "Polaric Server" is mainly a web based service to present APRS 
  tracking information on maps and where the information is updated at real-

diff --git a/debian/postinst b/debian/postinst
@@ -24,6 +24,12 @@ case "$1" in
            echo "Making a copy in /etc/polaric-aprsd/passwd.webapp.old"
            cp /etc/polaric-webapp/users /etc/polaric-aprsd/passwd.webapp.old
         fi
+        if [[ ! -e "/var/lib/polaric/users.dat" ]] ; then 
+           echo "admin,null,false,true,Admin User,,DEFAULT,false" > /var/lib/polaric/users.dat
+           chown polaric.polaric /var/lib/polaric/users.dat
+           chmod 644 /var/lib/polaric/users.dat
+        fi
+
         echo
         echo "******* Polaric-aprsd *******"
         echo "To configure server, point your browser to http://localhost:8081/config_menu"

diff --git a/view.profiles b/view.profiles
@@ -49,7 +49,7 @@ AUTOTAG {
 # Show all APRS
 ####################################################
 
-PUBLIC PROFILE all_aprs {
+PROFILE all_aprs {
     EXPORT "ALL APRS" => PUBLIC;
 }
 
@@ -62,7 +62,7 @@ PUBLIC PROFILE all_aprs {
 # is hidden when zooming out. 
 #####################################################
 
-PUBLIC PROFILE track {
+PROFILE track {
    EXPORT "Tracking" => PUBLIC; 
 
    TrackHide      => { hide-ident };
@@ -85,7 +85,7 @@ PUBLIC PROFILE track {
 # Show only points that are tagged as SAR
 ################################################## 
 
-PUBLIC PROFILE sar {
+PROFILE sar {
     EXPORT "Search and Rescue" => ALL;
     NOT *SAR  => { hide-all };
 }
@@ -96,7 +96,7 @@ PUBLIC PROFILE sar {
 # (In Norway LD prefix is used for infrasstructure)
 ###################################################
 
-PUBLIC PROFILE infra {
+PROFILE infra {
    EXPORT "Infrastructure" => PUBLIC;  
    NOT (ident ~ "LD.+" OR symbol ~ "/r|.#" OR IrlpNode OR EchoLink OR infra)
        => { hide-all };
@@ -107,7 +107,7 @@ PUBLIC PROFILE infra {
 # Active infrastructure.
 ###################################################
 
-PUBLIC PROFILE ainfra {
+PROFILE ainfra {
    EXPORT "Active infrastructure" => PUBLIC;  
    NOT infra => { hide-all  };
    infra     => { show-path };
@@ -120,7 +120,7 @@ PUBLIC PROFILE ainfra {
 # Show only moving points.
 ###################################################
 
-PUBLIC PROFILE moving {
+PROFILE moving {
     EXPORT "Moving trackers" => PUBLIC;
     NOT moving => { hide-all };
 }