Browse Source

Change keep_alive from string to integer / number

pull/52/head
rezor92 4 years ago
parent
commit
898e673852
  1. 2
      wg_dashboard_backend/migrations/versions/009_create_keep_alive.py
  2. 4
      wg_dashboard_backend/models.py
  3. 4
      wg_dashboard_backend/schemas.py
  4. 2
      wg_dashboard_frontend/src/app/interfaces/peer.ts
  5. 2
      wg_dashboard_frontend/src/app/page/dashboard/add-server/add-server.component.ts

2
wg_dashboard_backend/migrations/versions/009_create_keep_alive.py

@ -6,7 +6,7 @@ def upgrade(migrate_engine):
try:
meta = MetaData(bind=migrate_engine)
server = Table('server', meta, autoload=True)
keep_alive = Column('keep_alive', Text)
keep_alive = Column('keep_alive', Integer)
keep_alive.create(server)
except:
pass

4
wg_dashboard_backend/models.py

@ -42,7 +42,7 @@ class WGServer(Base):
endpoint = Column(sqlalchemy.String)
dns = Column(sqlalchemy.String)
allowed_ips = Column(sqlalchemy.String)
keep_alive = Column(sqlalchemy.String)
keep_alive = Column(sqlalchemy.Integer, default=0)
read_only = Column(sqlalchemy.Integer, default=0)
post_up = Column(sqlalchemy.String)
@ -65,7 +65,7 @@ class WGPeer(Base):
shared_key = Column(sqlalchemy.Text)
dns = Column(sqlalchemy.Text)
allowed_ips = Column(sqlalchemy.String)
keep_alive = Column(sqlalchemy.String)
keep_alive = Column(sqlalchemy.Integer, default=0)
read_only = Column(sqlalchemy.Integer, default=0)
server_id = Column(Integer, sqlalchemy.ForeignKey('server.id', ondelete="CASCADE", onupdate="CASCADE"))

4
wg_dashboard_backend/schemas.py

@ -132,7 +132,7 @@ class WGPeer(GenericModel):
server_id: str
dns: str = None
allowed_ips: str = None
keep_alive: str = None
keep_alive: int = None
configuration: str = None
class Meta:
@ -171,7 +171,7 @@ class WGServer(GenericModel):
post_down: str = None
dns: str = None
allowed_ips: str = None
keep_alive: str = None
keep_alive: int = None
read_only: int = None
peers: pydantic.typing.List['WGPeer'] = []

2
wg_dashboard_frontend/src/app/interfaces/peer.ts

@ -7,7 +7,7 @@ export interface Peer {
shared_key: string;
dns: string;
allowed_ips: string;
keep_alive: string;
keep_alive: number;
name: string;
configuration: string;
stats: {

2
wg_dashboard_frontend/src/app/page/dashboard/add-server/add-server.component.ts

@ -45,7 +45,7 @@ export class AddServerComponent implements OnInit {
defaultDNS = this.defaultIPv4Address + ",8.8.8.8"
defaultIPv6Address = "fd42:42:42::1"
defaultAllowedIPs = "0.0.0.0/0, ::/0"
defaultPersistentKeepalive = "0"
defaultPersistentKeepalive = 0;
serverForm: FormGroup = null;

Loading…
Cancel
Save