diff --git a/BuildServerArray.java b/BuildServerArray.java
index 9257751..3db5259 100644
--- a/BuildServerArray.java
+++ b/BuildServerArray.java
@@ -22,7 +22,7 @@ public class BuildServerArray {
// servers.put("10.0.0.119","unipi");
// servers.put("10.0.0.131","unipi");
// servers.put("10.0.0.118","unipi");
-// servers.put("10.0.0.137","unipi");
+ servers.put("10.0.0.137","unipi");
// servers.put("10.0.0.130","unipi");
// servers.put("10.0.0.110","unipi");
// servers.put("10.0.0.138","unipi");
@@ -64,7 +64,7 @@ public class BuildServerArray {
// servers.put("10.0.0.31", "lm");
// servers.put("10.0.0.32", "lm");
// servers.put("10.0.0.60", "lm");
-// servers.put("10.0.0.61", "lm");
+ servers.put("10.0.0.61", "lm");
// servers.put("10.0.0.102","unipi");
// servers.put("10.0.0.103","unipi");
@@ -79,12 +79,9 @@ public class BuildServerArray {
// servers.put("10.0.0.6", "lm");
-
-
-
//test
// servers.put("10.0.0.38","unipi");
- servers.put("10.0.0.5","lm");
+// servers.put("10.0.0.5","lm");
//PASSWORDS-------------------------------------------------
@@ -155,3 +152,4 @@ public class BuildServerArray {
return allServers;
}
}
+
diff --git a/CommandExecutor.java b/CommandExecutor.java
index df21c22..a49d3d1 100644
--- a/CommandExecutor.java
+++ b/CommandExecutor.java
@@ -21,14 +21,15 @@ public class CommandExecutor {
allServers = new BuildServerArray().getAllServers();
timeBetweenCommands = 1; // in seconds (if rebooting, put cca 20 seconds between reboots)
-// commandsToExecute = "tail -n 3 flowserver/monitor.txt";
// commandsToExecute = "sudo journalctl --vacuum-size=1M";
// commandsToExecute = "sudo service nodejs restart";
- commandsToExecute = "sudo service nodejs start";
// commandsToExecute = "rm -rf /home/unipi/flowserver/flow";
// commandsToExecute = "mkdir -p /home/unipi/flowserver/flow/helper";
-// commandsToExecute = "sudo reboot";
commandsToExecute = "python /root/flowserver/addSwitch.py";
+ commandsToExecute = "python3 /home/unipi/flowserver/addSwitch.py";
+ commandsToExecute = "sudo service nodejs stop";
+ commandsToExecute = "tail -n 3 flowserver/monitor.txt";
+// commandsToExecute = "sudo reboot";
// commandsToExecute = "ls -l /home/unipi/flowserver/databases";
// commandsToExecute = "ls -l /root/flowserver/databases";
@@ -45,11 +46,15 @@ public class CommandExecutor {
public void open(String username, String hostname, String password) throws JSchException {
JSch jSch = new JSch();
+ jSch.setKnownHosts("/home/rasta5man/.ssh/known_hosts");
+ jSch.addIdentity( "/home/rasta5man/.ssh/oms_key" );
session = jSch.getSession(username, hostname, 22);
- Properties config = new Properties();
- config.put("StrictHostKeyChecking", "no"); // not recommended
- session.setConfig(config);
+// Properties config = new Properties();
+ //config.put("StrictHostKeyChecking", "no"); // not recommended
+ //session.setConfig("StrictHostKeyChecking", "no"); // not recommended
+ //session.setConfig("PreferredAuthentications", "password");
+ //session.setConfig(config);
session.setPassword(password);
System.out.println("Connecting SSH to " + hostname + " - Please wait for few seconds... ");
diff --git a/README b/README
new file mode 100644
index 0000000..2f9a994
--- /dev/null
+++ b/README
@@ -0,0 +1,11 @@
+5.5.2025 ->
+Po zmene hesiel na unipi a lm sa script nechcel na unipi prihlasit!
+Potreba pridat do MAVEN dependancy namiesto standardnej "jsch":
+
+
+ com.github.mwiede
+ jsch
+ 0.2.26
+
+
+Po novom treba pre unipi pouzit jSch.addIdentity("ssh private key"), pre lm staci tento riadok vykomentovat a prihlasuje sa heslom
diff --git a/Server.java b/Server.java
index f66fe58..b6a4db4 100644
--- a/Server.java
+++ b/Server.java
@@ -35,6 +35,10 @@ public class Server {
public String toString() {
return "Server{" +
"host='" + host + '\'' +
+ ", username='" + username + '\'' +
+ ", password='" + password + '\'' +
+ ", path='" + path + '\'' +
+ ", port=" + port +
'}';
}
}
diff --git a/ServerBuilder.java b/ServerBuilder.java
index 9d80cbf..ae4877c 100644
--- a/ServerBuilder.java
+++ b/ServerBuilder.java
@@ -45,5 +45,15 @@ public class ServerBuilder {
return this;
}
+ @Override
+ public String toString() {
+ return "ServerBuilder{" +
+ "host='" + host + '\'' +
+ ", username='" + username + '\'' +
+ ", password='" + password + '\'' +
+ ", path='" + path + '\'' +
+ ", port=" + port +
+ '}';
+ }
}
diff --git a/UploadFiles.java b/UploadFiles.java
index 80e300a..9605fb9 100644
--- a/UploadFiles.java
+++ b/UploadFiles.java
@@ -14,15 +14,15 @@ public class UploadFiles {
private static final String[] filesToUpload =
{
// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/cloudmqttconnect.js",
-// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/cmd_manager.js",
+ "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/cmd_manager.js",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/code.js",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/comment.js",
// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/count.js",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/db_connector.js",
- // "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/db_init.js",
+ "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/db_init.js",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/debug.js",
// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/designer.json",
- // "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/dido_controller.js",
+ "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/dido_controller.js",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/httprequest.js",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/httpresponse.js",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/httproute.js",
@@ -40,7 +40,8 @@ public class UploadFiles {
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/virtualwireout.js",
// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/flow/wsmqttpublish.js",
//
- // "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/config",
+ "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/config",
+ "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/addSwitch.py",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/cloud_topic.py",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/createNodeDbOriginal.js",
// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/createNode.py",
@@ -60,7 +61,7 @@ public class UploadFiles {
// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/databases/notifications.table",
// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/databases/tbdata.nosql",
//// "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/databases/modbus_config.js",
- "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/addSwitch.py",
+ "/home/rasta5man/dev/oms/bitbucket-repositories/citysys-flowserver/databases/accelerometer_db.js",
};
@@ -74,7 +75,7 @@ public class UploadFiles {
private static ArrayList allServers;
- public static void main(String[] args) {
+ public static void main(String[] args) throws JSchException {
allServers = new BuildServerArray().getAllServers();
@@ -84,16 +85,18 @@ public class UploadFiles {
}
}
- private static void copyFileToServer(Server server) {
+ private static void copyFileToServer(Server server) throws JSchException {
JSch jsch = new JSch();
+ jsch.setKnownHosts("/home/rasta5man/.ssh/known_hosts");
+ jsch.addIdentity( "/home/rasta5man/.ssh/oms_key" );
Session session = null;
ChannelSftp sftpChannel = null;
try {
session = jsch.getSession(server.getUsername(), server.getHost(), server.getPort());
session.setPassword(server.getPassword());
- session.setConfig("StrictHostKeyChecking", "no"); // Avoids checking for new host keys (not recommended for production)
+ //session.setConfig("StrictHostKeyChecking", "no"); // Avoids checking for new host keys (not recommended for production)
session.connect();
sftpChannel = (ChannelSftp) session.openChannel("sftp");