Commit fde3cd1d authored by Dietmar Maurer's avatar Dietmar Maurer

depend on pve-firewall, connect firewall API

parent 363d7139
...@@ -18,9 +18,16 @@ use JSON; ...@@ -18,9 +18,16 @@ use JSON;
use PVE::RESTHandler; use PVE::RESTHandler;
use PVE::RPCEnvironment; use PVE::RPCEnvironment;
use PVE::JSONSchema qw(get_standard_option); use PVE::JSONSchema qw(get_standard_option);
use PVE::Firewall;
use PVE::API2::Firewall::Cluster;
use base qw(PVE::RESTHandler); use base qw(PVE::RESTHandler);
__PACKAGE__->register_method ({
subclass => "PVE::API2::Firewall::Cluster",
path => 'firewall',
});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
subclass => "PVE::API2::Backup", subclass => "PVE::API2::Backup",
path => 'backup', path => 'backup',
...@@ -73,6 +80,7 @@ __PACKAGE__->register_method ({ ...@@ -73,6 +80,7 @@ __PACKAGE__->register_method ({
{ name => 'ha' }, { name => 'ha' },
{ name => 'status' }, { name => 'status' },
{ name => 'nextid' }, { name => 'nextid' },
{ name => 'firewall' },
]; ];
return $result; return $result;
......
...@@ -19,6 +19,7 @@ use PVE::RPCEnvironment; ...@@ -19,6 +19,7 @@ use PVE::RPCEnvironment;
use PVE::JSONSchema qw(get_standard_option); use PVE::JSONSchema qw(get_standard_option);
use PVE::AccessControl; use PVE::AccessControl;
use PVE::Storage; use PVE::Storage;
use PVE::Firewall;
use PVE::OpenVZ; use PVE::OpenVZ;
use PVE::APLInfo; use PVE::APLInfo;
use PVE::QemuServer; use PVE::QemuServer;
...@@ -33,6 +34,7 @@ use PVE::API2::OpenVZ; ...@@ -33,6 +34,7 @@ use PVE::API2::OpenVZ;
use PVE::API2::VZDump; use PVE::API2::VZDump;
use PVE::API2::APT; use PVE::API2::APT;
use PVE::API2::Ceph; use PVE::API2::Ceph;
use PVE::API2::Firewall::Host;
use JSON; use JSON;
use base qw(PVE::RESTHandler); use base qw(PVE::RESTHandler);
...@@ -92,6 +94,11 @@ __PACKAGE__->register_method ({ ...@@ -92,6 +94,11 @@ __PACKAGE__->register_method ({
path => 'apt', path => 'apt',
}); });
__PACKAGE__->register_method ({
subclass => "PVE::API2::Firewall::Host",
path => 'firewall',
});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'index', name => 'index',
path => '', path => '',
...@@ -142,6 +149,7 @@ __PACKAGE__->register_method ({ ...@@ -142,6 +149,7 @@ __PACKAGE__->register_method ({
{ name => 'startall' }, { name => 'startall' },
{ name => 'stopall' }, { name => 'stopall' },
{ name => 'netstat' }, { name => 'netstat' },
{ name => 'firewall' },
]; ];
return $result; return $result;
......
...@@ -18,6 +18,7 @@ use PVE::RPCEnvironment; ...@@ -18,6 +18,7 @@ use PVE::RPCEnvironment;
use PVE::OpenVZ; use PVE::OpenVZ;
use PVE::OpenVZMigrate; use PVE::OpenVZMigrate;
use PVE::JSONSchema qw(get_standard_option); use PVE::JSONSchema qw(get_standard_option);
use PVE::API2::Firewall::VM;
use base qw(PVE::RESTHandler); use base qw(PVE::RESTHandler);
...@@ -500,6 +501,11 @@ __PACKAGE__->register_method({ ...@@ -500,6 +501,11 @@ __PACKAGE__->register_method({
return undef; return undef;
}}); }});
__PACKAGE__->register_method ({
subclass => "PVE::API2::Firewall::VM",
path => '{vmid}/firewall',
});
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'vmdiridx', name => 'vmdiridx',
path => '{vmid}', path => '{vmid}',
...@@ -541,6 +547,7 @@ __PACKAGE__->register_method({ ...@@ -541,6 +547,7 @@ __PACKAGE__->register_method({
{ subdir => 'initlog' }, { subdir => 'initlog' },
{ subdir => 'rrd' }, { subdir => 'rrd' },
{ subdir => 'rrddata' }, { subdir => 'rrddata' },
{ subdir => 'firewall' },
]; ];
return $res; return $res;
......
...@@ -3,7 +3,7 @@ Version: @VERSION@-@PACKAGERELEASE@ ...@@ -3,7 +3,7 @@ Version: @VERSION@-@PACKAGERELEASE@
Section: admin Section: admin
Priority: optional Priority: optional
Architecture: amd64 Architecture: amd64
Depends: perl (>= 5.10.0-19), libtimedate-perl, libauthen-pam-perl, libintl-perl, rsync, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl (>= 6.04-1), libnet-http-perl (>= 6.06-1), libhttp-daemon-perl, wget, libnet-dns-perl, vlan, ifenslave-2.6 (>= 1.1.0-10), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster (>= 1.0-29), libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control (>= 3.0-2), libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, redhat-cluster-pve, resource-agents-pve, fence-agents-pve, cstream, postfix | mail-transport-agent, libxml-parser-perl, lzop, dtach, libanyevent-perl, liburi-perl, logrotate, libanyevent-http-perl, apt-transport-https, libapt-pkg-perl, libcrypt-ssleay-perl, liblwp-protocol-https-perl, spiceterm, libuuid-perl, hdparm, gdisk, librados2-perl Depends: perl (>= 5.10.0-19), libtimedate-perl, libauthen-pam-perl, libintl-perl, rsync, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl (>= 6.04-1), libnet-http-perl (>= 6.06-1), libhttp-daemon-perl, wget, libnet-dns-perl, vlan, ifenslave-2.6 (>= 1.1.0-10), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster (>= 1.0-29), libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control (>= 3.0-2), libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, redhat-cluster-pve, resource-agents-pve, fence-agents-pve, cstream, postfix | mail-transport-agent, libxml-parser-perl, lzop, dtach, libanyevent-perl, liburi-perl, logrotate, libanyevent-http-perl, apt-transport-https, libapt-pkg-perl, libcrypt-ssleay-perl, liblwp-protocol-https-perl, spiceterm, libuuid-perl, hdparm, gdisk, librados2-perl, pve-firewall
Conflicts: netcat-openbsd, vzdump Conflicts: netcat-openbsd, vzdump
Replaces: vzdump Replaces: vzdump
Provides: vzdump Provides: vzdump
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment