lib/imperituroard.rb in imperituroard-0.5.5 vs lib/imperituroard.rb in imperituroard-0.5.7
- old
+ new
@@ -22,11 +22,11 @@
require 'imperituroard/projects/mhub'
require 'imperituroard/projects/iot'
require 'imperituroard/projects/dns'
require 'imperituroard/platforms/cps/qps_connector'
require 'imperituroard/platforms/public/telegram'
-require 'imperituroard/projects/dns/ukaz60'
+require 'imperituroard/projects/ukaz60'
require 'json'
require 'ipaddr'
require 'date'
require 'net/http'
@@ -253,11 +253,11 @@
def logger_to_audit_database(proc_name, src_ip, input_json, output_json, real_ip)
mongo_client.audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
end
def test111
- iot_connector.test
+ iot_connector.test1278493
end
end
@@ -343,16 +343,28 @@
dns_login,
dns_password,
belgim_login,
belgim_password,
belgim_url,
- ansible_tmp_folder,
- local_tmp_directory,
+
+ ###########for fortigate############
+ ansible_tmp_folder, #folder on fortigate ansible server where url list uploaded
+ local_tmp_directory, #folder on local mashin where script work
ansible_ssh_user,
ansible_ssh_password,
- ansible_host,
- url_backup_dir)
+ ansible_host, #fortigate ansible server
+ url_backup_dir,
+ ####################################
+
+ #########for STAROS#############
+ staros_login,
+ staros_password,
+ ukaz60_http_groups,
+ ukaz60_https_groups,
+ staros_hosts
+
+ )
=begin
@ukaz69_dns_func = Dns_2.new(telegram_api_url,
telegram_chat_id,
work_directory,
filename_blocked,
@@ -366,21 +378,27 @@
belgim_password,
belgim_url)
=end
@ukaz60_func = Ukaz60All_2.new(telegram_api_url,
- telegram_chat_id,
- belgim_login,
- belgim_password,
- belgim_url,
- ansible_tmp_folder,
- local_tmp_directory,
- ansible_ssh_user,
- ansible_ssh_password,
- ansible_host,
- url_backup_dir)
+ telegram_chat_id,
+ belgim_login,
+ belgim_password,
+ belgim_url,
+ ansible_tmp_folder,
+ local_tmp_directory,
+ ansible_ssh_user,
+ ansible_ssh_password,
+ ansible_host,
+ url_backup_dir,
+ staros_login,
+ staros_password,
+ ukaz60_http_groups,
+ ukaz60_https_groups,
+ staros_hosts)
end
+ #1 block all devices by belgim list
def no_pasaran
ukaz60_func.no_pasaran
end
end
\ No newline at end of file