1.3.2-stable release, deprecation notice

vilhelmprytz · Jun 18, 2019 · 4858cec · 4858cec
1 parent 05638a0
commit 4858cec
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+Version 1.3.2 (Status: RELEASED)
+* Deprecation notice
+
 Version 1.3.1 (Status: RELEASED)
 * Bugfix: Slaves reported incorrect date to nafsdmctl slavestatus (minute instead of month under the "latest connection date" section)
 * Slaves now check if another nafsdm-slave process is running before boot

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # nafsdm
-**:warning: Current status: DEPRECATED, version 1.3.1-stable**
+**:warning: Current status: DEPRECATED, version 1.3.2-stable**
 
 :warning: **nafsdm is no longer maintained and will not recieve any future updates! Use at your own risk.**
 

diff --git a/master-nafsdm/nafsdmctl/__main__.py b/master-nafsdm/nafsdmctl/__main__.py
@@ -300,3 +300,5 @@ def printSlaveConnections():
 else:
     printSyntax()
     exit(1)
+
+errorPrint("DEPRECATION WARNING: 1.3.2-stable is the final release of nafsdm. Use it at your own risk.")
diff --git a/master-nafsdm/pythondaemon/__main__.py b/master-nafsdm/pythondaemon/__main__.py
@@ -65,3 +65,5 @@
 checkUpdate()
 
 log("nafsdm-master is now ready.")
+
+log("DEPRECATION WARNING: 1.3.2-stable is the final release of nafsdm. Use it at your own risk.")
diff --git a/master-nafsdm/pythondaemon/version.py b/master-nafsdm/pythondaemon/version.py
@@ -1 +1 @@
-version = "1.3.1-stable"
+version = "1.3.2-stable"
diff --git a/master-nafsdm/webinterface/templates/index.html b/master-nafsdm/webinterface/templates/index.html
@@ -4,6 +4,7 @@
 </head>
 <body>
   <h1>nafsdm webinterface - version {{ version }}</h1>
+  <p><font color="red">DEPRECATION WARNING: 1.3.2-stable is the final release of nafsdm. Use it at your own risk.</font></p>
   <p>List of all domains</p> <a href="/?add=yes"><button>Add new domain</button></a>
 
   {% if addSuccess %}

diff --git a/scripts/upgradeMaster.sh b/scripts/upgradeMaster.sh
@@ -73,6 +73,9 @@ elif [ "$MY_VERSION_RAW" == 'version = "1.2.5-stable"' ]; then
 elif [ "$MY_VERSION_RAW" == 'version = "1.3-stable"' ]; then
   echo "* Detected version 1.3-stable - supported by this upgrade script."
   MY_VERSION="1.3-stable"
+elif [ "$MY_VERSION_RAW" == 'version = "1.3.1-stable"' ]; then
+  echo "* Detected version 1.3-stable - supported by this upgrade script."
+  MY_VERSION="1.3.1-stable"
 else
   if [ "$DEV_IC_MODE" == "False" ]; then
     echo "* Your version is not supported (dev versions and 1.0 is not supported)."
@@ -352,6 +355,34 @@ elif [ "$MY_VERSION" == "1.3-stable" ]; then
 
   echo "* Update completed. Nothing to do or change!"
 
+elif [ "$MY_VERSION" == "1.3.1-stable" ]; then
+  echo "* Replacing python files.."
+  rm -rf /home/master-nafsdm/pythondaemon
+  rm -rf /home/master-nafsdm/nafsdmctl
+  cp nafsdm/master-nafsdm/pythondaemon /home/master-nafsdm/pythondaemon -R
+  cp nafsdm/master-nafsdm/nafsdmctl /home/master-nafsdm/nafsdmctl -R
+
+  # newer than version 1.2.4, all versions that already have the webinterface
+  echo "* Replacing webinterface.."
+  rm -rf /home/master-nafsdm/webinterface
+  cp nafsdm/master-nafsdm/webinterface /home/master-nafsdm/webinterface -R
+  cp nafsdm/systemconfigs/nafsdm-webinterface.service /home/master-nafsdm/webinterface/nafsdm-webinterface.service
+  chmod +x /home/master-nafsdm/webinterface/enableInterface.sh
+  chmod +x /home/master-nafsdm/webinterface/start.sh
+
+  # newer than version 1.2.4
+  echo "* Installing required python packages.."
+  pip install -r requirements.txt
+  rm -rf requirements.txt
+
+  # from version 1.3 onwards
+  if [ ! -d "/home/master-nafsdm/slaveAlive" ]; then
+    mkdir /home/master-nafsdm/slaveAlive
+  fi
+  chown -R master-nafsdm:master-nafsdm /home/master-nafsdm/slaveAlive
+
+  echo "* Update completed. Nothing to do or change!"
+
 # for dev versions
 elif [ "$MY_VERSION" == "dev_release" ]; then
   echo "* Replacing python files.."

diff --git a/scripts/upgradeSlave.sh b/scripts/upgradeSlave.sh
@@ -70,6 +70,9 @@ elif [ "$MY_VERSION_RAW" == 'version = "1.2.5-stable"' ]; then
 elif [ "$MY_VERSION_RAW" == 'version = "1.3-stable"' ]; then
   echo "* Detected version 1.3-stable - supported by this upgrade script."
   MY_VERSION="1.3-stable"
+elif [ "$MY_VERSION_RAW" == 'version = "1.3.1-stable"' ]; then
+  echo "* Detected version 1.3.1-stable - supported by this upgrade script."
+  MY_VERSION="1.3.1-stable"
 else
   if [ "$DEV_IC_MODE" == "False" ]; then
     echo "* Your version is not supported (dev versions and 1.0 is not supported)."
@@ -397,6 +400,31 @@ elif [ "$MY_VERSION" == "1.3-stable" ]; then
   echo "* Upgrade completed. You can now start nafsdm-slave again (make sure master is also upgraded!)-"
   rm -rf /home/slave-nafsdm/pythondaemon/tempUpgrade/temp_upgrade.sh
 
+elif [ "$MY_VERSION" == "1.3.1-stable" ]; then
+  echo "* Replacing python files.."
+  rm -rf /home/slave-nafsdm/pythondaemon
+  cp nafsdm/slave-nafsdm/pythondaemon /home/slave-nafsdm/pythondaemon -R
+
+  # nafscli reinstall (delete and copy) (from version 1.2.5 onwards)
+  echo "* Replacing nafscli.."
+  rm -rf /home/slave-nafsdm/nafscli
+  cp nafsdm/slave-nafsdm/nafscli /home/slave-nafsdm/nafscli -R
+
+  # install from req file (released in version 1.3.1)
+  echo "* Installing required python packages.."
+  pip install -r requirements.txt
+  rm -rf requirements.txt
+
+  # as of 1.3.1, replace systemd file
+  echo "* Replacing systemd service.."
+  rm -rf /etc/systemd/system/nafsdm-slave.service
+  cp nafsdm/systemconfigs/nafsdm-slave.service /etc/systemd/system/nafsdm-slave.service
+  systemctl daemon-reload
+
+  echo "* Upgrade completed. You can now start nafsdm-slave again (make sure master is also upgraded!)-"
+  rm -rf /home/slave-nafsdm/pythondaemon/tempUpgrade/temp_upgrade.sh
+
+
 # for dev versions
 elif [ "$MY_VERSION" == "dev_release" ]; then
   echo "* Replacing python files.."

diff --git a/slave-nafsdm/nafscli/__main__.py b/slave-nafsdm/nafscli/__main__.py
@@ -254,3 +254,5 @@ def setCLIState(newState):
 
 else:
     print("nafscli: " + bcolors.FAIL + "no such command '" + bcolors.BOLD + sys.argv[1] + "'" + bcolors.ENDC)
+
+errorPrint("DEPRECATION WARNING: 1.3.2-stable is the final release of nafsdm. Use it at your own risk.")
diff --git a/slave-nafsdm/pythondaemon/__main__.py b/slave-nafsdm/pythondaemon/__main__.py
@@ -132,6 +132,9 @@ def main():
     # prestart checks pass
     logging.info("Pre-start checks completed")
 
+    # deprecation
+    logging.warning("DEPRECATION 1.3.2-stable is the final release of nafsdm. Use it at your own risk.")
+
     # run the daemon itself
     runDaemon(config)
 

diff --git a/slave-nafsdm/pythondaemon/version.py b/slave-nafsdm/pythondaemon/version.py
@@ -1 +1 @@
-version = "1.3.1-stable"
+version = "1.3.2-stable"
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-WARNING-DEPRECATED
+1.3.2-stable