feat(IPv6): Add IPv6 support

frappe · Oct 15, 2024 · eb5a537 · eb5a537
1 parent b0a2780
commit eb5a537
Show file tree

Hide file tree

Showing 25 changed files with 113 additions and 12 deletions.
diff --git a/debugging/mariadb.build.md b/debugging/mariadb.build.md
@@ -176,6 +176,7 @@ usermod -aG frappe www-data
 ```nginx
 echo "server {
  listen 80;
+ listen [::]:80;
  server_name packages.frappe.cloud;
 
  location / {

diff --git a/deployment/nginx.conf b/deployment/nginx.conf
@@ -9,13 +9,15 @@ upstream frappe-bench-socketio-server {
 
 
 server {
- listen 80 default_server;
+ listen 80 default_server;
+ listen [::]:80 default_server;
  server_name "";
  return 444;
 }
 
 server {
  listen 443 ssl http2 default_server;
+ listen [::]:443 ssl http2 default_server;
  server_name "";
 
  ssl on;
@@ -42,6 +44,7 @@ map $host $site_name_sxjfjnv {
 server {
 
  listen 443 ssl http2;
+ listen [::]:443 ssl http2;
 
 
  server_name
@@ -75,6 +78,7 @@ server {
  return 301 https://$host$request_uri;
  } # managed by Certbot
  listen 80;
+ listen [::]:80;
  server_name
  frappe.cloud
  ;
@@ -88,6 +92,7 @@ proxy_cache_path /var/cache/nginx/assets keys_zone=assets_cache:10m loader_thres
 server {
 
  listen 443 ssl http2;
+ listen [::]:443 ssl http2;
 
 
  server_name
@@ -431,6 +436,7 @@ server {
 
 
  listen 80;
+ listen [::]:80;
  server_name
  frappecloud.com
  ;

diff --git a/press/docker/registry.conf b/press/docker/registry.conf
@@ -17,6 +17,7 @@ map $upstream_http_docker_distribution_api_version $docker_distribution_api_vers
 
 server {
  listen 443 ssl;
+ listen [::]:443 ssl;
  server_name registry.frappe.cloud;
 
  # SSL

diff --git a/press/playbooks/roles/ssl_nginx/templates/ssl.conf b/press/playbooks/roles/ssl_nginx/templates/ssl.conf
@@ -1,5 +1,6 @@
 server {
  listen 80;
+ listen [::]:80;
  server_name {{ domain }};
 
  location ^~ /.well-known/acme-challenge/ {

diff --git a/press/press/doctype/analytics_server/analytics_server.json b/press/press/doctype/analytics_server/analytics_server.json
@@ -14,6 +14,7 @@
  "is_server_setup",
  "networking_section",
  "ip",
+ "ip6",
  "column_break_10",
  "private_ip",
  "private_mac_address",
@@ -107,6 +108,13 @@
  "reqd": 1,
  "set_only_once": 1
  },
+ {
+ "fetch_from": "virtual_machine.public_ip6_address",
+ "fieldname": "ip6",
+ "fieldtype": "Data",
+ "label": "IPv6",
+ "set_only_once": 1
+ },
  {
  "fieldname": "column_break_10",
  "fieldtype": "Column Break"
@@ -252,7 +260,7 @@
  "link_fieldname": "server"
  }
  ],
- "modified": "2023-12-13 15:09:40.978998",
+ "modified": "2024-10-15 15:28:10.193273",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Analytics Server",

diff --git a/press/press/doctype/analytics_server/analytics_server.py b/press/press/doctype/analytics_server/analytics_server.py
@@ -28,6 +28,7 @@ class AnalyticsServer(BaseServer):
  google_client_secret: DF.Password | None
  hostname: DF.Data
  ip: DF.Data
+ ip6: DF.Data | None
  is_server_setup: DF.Check
  monitoring_password: DF.Password | None
  plausible_mail_login: DF.Data | None

diff --git a/press/press/doctype/app_release/code.md b/press/press/doctype/app_release/code.md
@@ -10,6 +10,7 @@ docker run -it -p 127.0.0.1:8021:8080 \
 ```
 server {
  listen 80;
+ listen [::]:80;
  server_name code.staging.frappe.cloud;
  location / {
  proxy_pass http://127.0.0.1:8021;

diff --git a/press/press/doctype/database_server/database_server.json b/press/press/doctype/database_server/database_server.json
@@ -28,6 +28,7 @@
  "auto_add_storage_max",
  "networking_section",
  "ip",
+ "ip6",
  "column_break_10",
  "private_ip",
  "private_mac_address",
@@ -104,6 +105,13 @@
  "label": "IP",
  "set_only_once": 1
  },
+ {
+ "fetch_from": "virtual_machine.public_ip6_address",
+ "fieldname": "ip6",
+ "fieldtype": "Data",
+ "label": "IPv6",
+ "set_only_once": 1
+ },
  {
  "fetch_from": "virtual_machine.private_ip_address",
  "fieldname": "private_ip",
@@ -521,7 +529,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-08-13 11:02:07.399141",
+ "modified": "2024-10-15 15:28:10.193273",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Database Server",

diff --git a/press/press/doctype/database_server/database_server.py b/press/press/doctype/database_server/database_server.py
@@ -42,6 +42,7 @@ class DatabaseServer(BaseServer):
  hostname: DF.Data
  hostname_abbreviation: DF.Data | None
  ip: DF.Data | None
+ ip6: DF.Data | None
  is_performance_schema_enabled: DF.Check
  is_primary: DF.Check
  is_replication_setup: DF.Check

diff --git a/press/press/doctype/log_server/log_server.json b/press/press/doctype/log_server/log_server.json
@@ -15,6 +15,7 @@
  "is_server_setup",
  "networking_section",
  "ip",
+ "ip6",
  "column_break_9",
  "private_ip",
  "private_mac_address",
@@ -90,6 +91,13 @@
  "label": "IP",
  "set_only_once": 1
  },
+ {
+ "fetch_from": "virtual_machine.public_ip6_address",
+ "fieldname": "ip6",
+ "fieldtype": "Data",
+ "label": "IPv6",
+ "set_only_once": 1
+ },
  {
  "fieldname": "column_break_9",
  "fieldtype": "Column Break"
@@ -198,7 +206,7 @@
  "link_fieldname": "server"
  }
  ],
- "modified": "2023-12-13 15:09:14.473225",
+ "modified": "2024-10-15 15:28:10.193273",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Log Server",

diff --git a/press/press/doctype/log_server/log_server.py b/press/press/doctype/log_server/log_server.py
@@ -24,6 +24,7 @@ class LogServer(BaseServer):
  frappe_user_password: DF.Password | None
  hostname: DF.Data
  ip: DF.Data | None
+ ip6: DF.Data | None
  is_server_setup: DF.Check
  kibana_password: DF.Password | None
  monitoring_password: DF.Password | None

diff --git a/press/press/doctype/monitor_server/monitor_server.json b/press/press/doctype/monitor_server/monitor_server.json
@@ -15,6 +15,7 @@
  "is_server_setup",
  "networking_section",
  "ip",
+ "ip6",
  "column_break_9",
  "private_ip",
  "private_mac_address",
@@ -92,6 +93,13 @@
  "label": "IP",
  "set_only_once": 1
  },
+ {
+ "fetch_from": "virtual_machine.public_ip6_address",
+ "fieldname": "ip6",
+ "fieldtype": "Data",
+ "label": "IPv6",
+ "set_only_once": 1
+ },
  {
  "fieldname": "column_break_9",
  "fieldtype": "Column Break"
@@ -212,7 +220,7 @@
  "link_fieldname": "server"
  }
  ],
- "modified": "2024-02-05 20:07:19.024804",
+ "modified": "2024-10-15 15:28:10.193273",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Monitor Server",

diff --git a/press/press/doctype/monitor_server/monitor_server.py b/press/press/doctype/monitor_server/monitor_server.py
@@ -28,6 +28,7 @@ class MonitorServer(BaseServer):
  grafana_password: DF.Password | None
  hostname: DF.Data
  ip: DF.Data | None
+ ip6: DF.Data | None
  is_server_setup: DF.Check
  monitoring_password: DF.Password | None
  private_ip: DF.Data

diff --git a/press/press/doctype/proxy_server/proxy_server.json b/press/press/doctype/proxy_server/proxy_server.json
@@ -20,6 +20,7 @@
  "public",
  "section_break_8",
  "ip",
+ "ip6",
  "enabled_default_routing",
  "column_break_10",
  "private_ip",
@@ -70,6 +71,13 @@
  "label": "IP",
  "set_only_once": 1
  },
+ {
+ "fetch_from": "virtual_machine.public_ip6_address",
+ "fieldname": "ip6",
+ "fieldtype": "Data",
+ "label": "IPv6",
+ "set_only_once": 1
+ },
  {
  "fetch_from": "virtual_machine.private_ip_address",
  "fieldname": "private_ip",
@@ -400,7 +408,7 @@
  }
  ],
  "links": [],
- "modified": "2024-09-10 15:44:10.989216",
+ "modified": "2024-10-15 15:28:10.193273",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Proxy Server",

diff --git a/press/press/doctype/proxy_server/proxy_server.py b/press/press/doctype/proxy_server/proxy_server.py
@@ -41,6 +41,7 @@ class ProxyServer(BaseServer):
  hostname: DF.Data
  hostname_abbreviation: DF.Data | None
  ip: DF.Data | None
+ ip6: DF.Data | None
  is_primary: DF.Check
  is_proxysql_setup: DF.Check
  is_replication_setup: DF.Check

diff --git a/press/press/doctype/registry_server/registry_server.json b/press/press/doctype/registry_server/registry_server.json
@@ -14,6 +14,7 @@
  "is_server_setup",
  "networking_section",
  "ip",
+ "ip6",
  "column_break_9",
  "private_ip",
  "private_mac_address",
@@ -75,6 +76,13 @@
  "reqd": 1,
  "set_only_once": 1
  },
+ {
+ "fetch_from": "virtual_machine.public_ip6_address",
+ "fieldname": "ip6",
+ "fieldtype": "Data",
+ "label": "IPv6",
+ "set_only_once": 1
+ },
  {
  "fetch_from": "virtual_machine.private_ip_address",
  "fieldname": "private_ip",
@@ -204,7 +212,7 @@
  "link_fieldname": "server"
  }
  ],
- "modified": "2023-12-13 15:09:46.909110",
+ "modified": "2024-10-15 15:28:10.193273",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Registry Server",

diff --git a/press/press/doctype/registry_server/registry_server.py b/press/press/doctype/registry_server/registry_server.py
@@ -26,6 +26,7 @@ class RegistryServer(BaseServer):
  frappe_user_password: DF.Password | None
  hostname: DF.Data
  ip: DF.Data
+ ip6: DF.Data | None
  is_server_setup: DF.Check
  monitoring_password: DF.Password | None
  private_ip: DF.Data

diff --git a/press/press/doctype/self_hosted_server/self_hosted_server.json b/press/press/doctype/self_hosted_server/self_hosted_server.json
@@ -22,6 +22,7 @@
  "server_created",
  "server",
  "ip",
+ "ip6",
  "ssh_user",
  "column_break_smwr",
  "existing_bench_present",
@@ -95,6 +96,12 @@
  "label": "IP",
  "reqd": 1
  },
+ {
+ "fieldname": "ip6",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "IPv6"
+ },
  {
  "default": "root",
  "fetch_from": ".ssh_user",
@@ -451,7 +458,7 @@
  }
  ],
  "links": [],
- "modified": "2024-05-29 11:41:41.304954",
+ "modified": "2024-10-15 15:28:10.193273",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Self Hosted Server",

diff --git a/press/press/doctype/self_hosted_server/self_hosted_server.py b/press/press/doctype/self_hosted_server/self_hosted_server.py
@@ -49,6 +49,7 @@ class SelfHostedServer(Document):
  hostname: DF.Data | None
  instance_type: DF.Data | None
  ip: DF.Data
+ ip6: DF.Data | None
  is_managed_database: DF.Check
  mariadb_ip: DF.Data | None
  mariadb_private_ip: DF.Data | None

diff --git a/press/press/doctype/server/server.json b/press/press/doctype/server/server.json
@@ -29,6 +29,7 @@
  "auto_add_storage_max",
  "networking_section",
  "ip",
+ "ip6",
  "column_break_3",
  "private_ip",
  "private_mac_address",
@@ -87,6 +88,13 @@
  "label": "IP",
  "set_only_once": 1
  },
+ {
+ "fetch_from": "virtual_machine.public_ip6_address",
+ "fieldname": "ip6",
+ "fieldtype": "Data",
+ "label": "IPv6",
+ "set_only_once": 1
+ },
  {
  "fieldname": "proxy_server",
  "fieldtype": "Link",
@@ -526,7 +534,7 @@
  }
  ],
  "links": [],
- "modified": "2024-09-24 12:56:06.423649",
+ "modified": "2024-10-15 15:28:10.193273",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Server",

diff --git a/press/press/doctype/server/server.py b/press/press/doctype/server/server.py
@@ -1102,6 +1102,7 @@ class Server(BaseServer):
  hostname_abbreviation: DF.Data | None
  ignore_incidents_since: DF.Datetime | None
  ip: DF.Data | None
+ ip6: DF.Data | None
  is_managed_database: DF.Check
  is_primary: DF.Check
  is_replication_setup: DF.Check