diff --git a/LICENSE b/LICENSE index 471a07628..c165420f4 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,6 @@ Copyright (c) 2005-2006 Colin Smith Copyright (c) 2013 Dagorlad Copyright (c) 2006 Daniel S. Haischt Copyright (c) 2012 Darren Embry -Copyright (c) 2018 David Harrigan Copyright (c) 2005-2012 David Zeller Copyright (c) 2014-2019 Deciso B.V. Copyright (c) 2006-2015 Devin Teske diff --git a/plist b/plist index 5373b96b6..bcd49b931 100644 --- a/plist +++ b/plist @@ -418,7 +418,6 @@ /usr/local/opnsense/mvc/app/library/OPNsense/Backup/IBackupProvider.php /usr/local/opnsense/mvc/app/library/OPNsense/Backup/Local.php /usr/local/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php -/usr/local/opnsense/mvc/app/library/OPNsense/Backup/Scp.php /usr/local/opnsense/mvc/app/library/OPNsense/Base/Filters/QueryFilter.php /usr/local/opnsense/mvc/app/library/OPNsense/Base/UIModelGrid.php /usr/local/opnsense/mvc/app/library/OPNsense/Base/ViewTranslator.php @@ -446,8 +445,6 @@ /usr/local/opnsense/mvc/app/library/OPNsense/OpenVPN/ViscosityVisz.php /usr/local/opnsense/mvc/app/models/OPNsense/Backup/NextcloudSettings.php /usr/local/opnsense/mvc/app/models/OPNsense/Backup/NextcloudSettings.xml -/usr/local/opnsense/mvc/app/models/OPNsense/Backup/ScpSettings.php -/usr/local/opnsense/mvc/app/models/OPNsense/Backup/ScpSettings.xml /usr/local/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php /usr/local/opnsense/mvc/app/models/OPNsense/Base/BaseModelMigration.php /usr/local/opnsense/mvc/app/models/OPNsense/Base/Constraints/AllOrNoneConstraint.php diff --git a/src/opnsense/mvc/app/library/OPNsense/Backup/Scp.php b/src/opnsense/mvc/app/library/OPNsense/Backup/Scp.php deleted file mode 100644 index c5b5ff1d7..000000000 --- a/src/opnsense/mvc/app/library/OPNsense/Backup/Scp.php +++ /dev/null @@ -1,130 +0,0 @@ - 'enabled', - 'type' => 'checkbox', - 'label' => gettext('Enable'), - ), - array( - 'name' => 'hostname', - 'type' => 'text', - 'label' => gettext('Hostname'), - 'help' => gettext('Set the remote hostname.'), - ), - array( - 'name' => 'port', - 'type' => 'text', - 'label' => gettext('Port'), - 'help' => gettext('Set the remote port.'), - ), - array( - 'name' => 'username', - 'type' => 'text', - 'label' => gettext('Remote Username'), - 'help' => gettext('Set the remote username.'), - ), - array( - 'name' => 'remotedirectory', - 'type' => 'text', - 'label' => gettext('Remote Directory'), - 'help' => gettext('Set the remote directory to backup the config file to.'), - ) - ); - $mdl = new ScpSettings(); - foreach ($fields as &$field) { - $field['value'] = (string)$mdl->getNodeByReference($field['name']); - } - return $fields; - } - - /** - * backup provider name - * @return string user friendly name - */ - public function getName() - { - return gettext('Secure Copy'); - } - - /** - * validate and set configuration - * @param array $conf configuration array - * @return array of validation errors when not saved - */ - public function setConfiguration($conf) - { - $mdl = new ScpSettings(); - $this->setModelProperties($mdl, $conf); - $validation_messages = $this->validateModel($mdl); - if (empty($validation_messages)) { - $mdl->serializeToConfig(); - Config::getInstance()->save(); - } - return $validation_messages; - } - - /** - * @return array filelist - */ - public function backup() - { - // not configured / issue, return empty list - return array(); - } - - /** - * Is this provider enabled - * @return boolean enabled status - */ - public function isEnabled() - { - $mdl = new ScpSettings(); - return (string)$mdl->enabled === "1"; - } -} diff --git a/src/opnsense/mvc/app/models/OPNsense/Backup/ScpSettings.php b/src/opnsense/mvc/app/models/OPNsense/Backup/ScpSettings.php deleted file mode 100644 index a42b916f6..000000000 --- a/src/opnsense/mvc/app/models/OPNsense/Backup/ScpSettings.php +++ /dev/null @@ -1,39 +0,0 @@ - - //system/backup/scp - Backup the config using SCP. - 0.1.0 - - - 0 - Y - - - /\S*/ - The hostname contains whitespace characters. - - - Please provide a hostname. - DependConstraint - - enabled - - - - - - 22 - Y - 1 - 65535 - Please provide a valid port number between 1 and 65535. Port 22 is the default. - - - /\S*/ - The username contains whitespace characters. - - - Please provide a username. - DependConstraint - - enabled - - - - - - OPNsense-Backup - Y - Please provide a remote directory. - - -