diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index c251eb7..51ef82d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -32,17 +32,17 @@ jobs:
- name: Build Book
run: mdbook build
- - name: Build Website
- uses: shalzz/zola-deploy-action@v0.17.2
- env:
- BUILD_DIR: ./docs/website
- BUILD_ONLY: true
+ - name: Build rustdoc
+ uses: actions-rs/cargo@v1
+ with:
+ command: doc
+ args: --no-deps --workspace --document-private-items
- - name: Combine Book and Website
- run: mkdir -p /tmp/combined && cp -rv docs/website/public/* /tmp/combined && cp -rv target/book/ /tmp/combined/book
+ - name: Combine Book and rustdoc
+ run: mkdir -p /tmp/combined && cp -rv target/book/ /tmp/combined/book && cp -rv target/doc/ /tmp/combined/rustdoc-master
- name: Write CNAME file
- run: echo "protomask.ewpratten.com" > /tmp/combined/CNAME
+ run: echo "docs.protomask.ewpratten.com" > /tmp/combined/CNAME
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
diff --git a/.markdownlint.json b/.markdownlint.json
index 2ec9c5f..a6c0a23 100644
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -1,4 +1,5 @@
{
"MD033": false,
- "MD013": false
+ "MD013": false,
+ "MD022": false
}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 95c1b16..816dc6e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,5 +11,14 @@
"editor.tabSize": 2,
"editor.autoIndent": "advanced",
"diffEditor.ignoreTrimWhitespace": false
+ },
+ "files.associations": {
+ "*.json.liquid": "json",
+ "*.yaml.liquid": "yaml",
+ "*.md.liquid": "markdown",
+ "*.js.liquid": "liquid-javascript",
+ "*.css.liquid": "liquid-css",
+ "*.scss.liquid": "liquid-scss",
+ "docs/website/_redirects": "plaintext"
}
}
\ No newline at end of file
diff --git a/docs/website/.gitignore b/docs/website/.gitignore
deleted file mode 100644
index 85a1daf..0000000
--- a/docs/website/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/public
\ No newline at end of file
diff --git a/docs/website/_redirects b/docs/website/_redirects
new file mode 100644
index 0000000..9dde74f
--- /dev/null
+++ b/docs/website/_redirects
@@ -0,0 +1,3 @@
+/ https://github.com/ewpratten/protomask 302
+/book https://docs.protomask.ewpratten.com/book
+/rustdoc https://docs.protomask.ewpratten.com/rustdoc-master
diff --git a/docs/website/config.toml b/docs/website/config.toml
deleted file mode 100644
index e92be9a..0000000
--- a/docs/website/config.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-base_url = "https://protomask.ewpratten.com"
-compile_sass = true
-build_search_index = true
-
-[markdown]
-highlight_code = true
-
-[extra]
diff --git a/docs/website/content/_index.md b/docs/website/content/_index.md
deleted file mode 100644
index d7d76b9..0000000
--- a/docs/website/content/_index.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: Protomask
----
-
-## What is protomask?
-
-Protomask is a user space [NAT64](https://en.wikipedia.org/wiki/NAT64) implementation geared towards networks that need fast and reliable inter-protocol packet translation. Behind the scenes, protomask uses the [Universal TUN/TAP Device Driver](https://docs.kernel.org/networking/tuntap.html) to translate incoming packets from IPv4 to IPv6 and vice-versa.
-
-## The protomask tool suite
-
-To accomplish the various translation needs of an IPv6-only or dual-stack ISP, the protomask tool suite includes a few tools:
-
-- **`protomask`**: The main NAT64 daemon
- - Translates IPv6 packets using *RFC6052 IPv4-Embedded IPv6 Addressing* to native IPv4 traffic
- - Can handle high volumes of traffic from multiple clients simultaneously
-- **`protomask-clat`**: A Customer-side transLATor (CLAT) implementation
- - Intended to be deployed at the customer edge to pass IPv4 traffic over an IPv6-only ISP's network
-
-Every tool in the protomask suite is easy to deploy and configure, plus supports optionally exposing Prometheus metrics for remote monitoring.
-
-## The protomask library suite
-
-The development of protomask necessitated the creation of a few specialized software libraries. Since the technology developed for protomask is useful outside of the scope of this project, these libraries are also available for general use:
-
-- **`easy-tun`**: A minimal TUN interface library
-- **`fast-nat`**: A library designed for highly efficient mapping and lookup of IP address pairs
-- **`interproto`**: The heart of protomask, a library for translating many types of packets between layer 3 protocols
-- **`rfc6052`**: A Rust implementation of RFC6052
-- **`rtnl`**: A high-level wrapper around `rtnetlink`
-
-## Want to learn more?
-
-Check out the [documentation](/book) for a deeper dive into protomask, or head over to the [GitHub repository](https://github.com/ewpratten/protomask) to see the source code.
diff --git a/docs/website/sass/main.scss b/docs/website/sass/main.scss
deleted file mode 100644
index 61d6f9a..0000000
--- a/docs/website/sass/main.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-.container {
- max-width: 1000px !important;
-
- h2 {
- font-weight: bold;
- }
-}
-
-@media screen and (max-width: 405px) {
- .navbar-brand{
- display:none;
- }
-}
-
-#hero-title {
- font-size:5em;
-
- @media screen and (max-width: 420px) {
- font-size: 3em;
- }
-}
\ No newline at end of file
diff --git a/docs/website/templates/base.html b/docs/website/templates/base.html
deleted file mode 100644
index 19fffed..0000000
--- a/docs/website/templates/base.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
- {% block title %}{% endblock title %}
-
-
-
-
-
-
-
-
-
-
-
- {% block content %}{% endblock content %}
-
-
-
- Protomask is a project by Evan Pratten
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/website/templates/index.html b/docs/website/templates/index.html
deleted file mode 100644
index b995ca0..0000000
--- a/docs/website/templates/index.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{section.title}}{% endblock title %}
-
-{% block content %}
-
-
-
Protomask
- Fast & reliable user space NAT64
-
-
-
-
- {{section.content|safe}}
-
-
-{% endblock content %}
\ No newline at end of file