Redirect /nixops to the NixOps project on GitHub

NixOS · Mar 13, 2020 · a0ee064 · a0ee064
1 parent f7273a1
commit a0ee064
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 138 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,9 +18,6 @@
 /nix/manual/
 /nix/manual-raw
 
-/nixops/manual/
-/nixops/manual-raw
-
 /blogs.json
 /blogs.xml
 /favicon.png

diff --git a/Makefile b/Makefile
@@ -15,8 +15,7 @@ HTML = index.html news.html \
   nixos/security.html nixos/foundation.html \
   nixos/wiki.html \
   disnix/index.html disnix/download.html disnix/docs.html \
-  disnix/extensions.html disnix/examples.html disnix/support.html \
-  nixops/index.html
+  disnix/extensions.html disnix/examples.html disnix/support.html
 
 
 ### Prettify the NixOS manual.
@@ -58,18 +57,6 @@ $(NIX_MANUAL_OUT): $(call rwildcard, $(NIX_MANUAL_IN), *) bootstrapify-docbook.s
 	ln -sfn manual.html $(NIX_MANUAL_OUT)/index.html
 
 
-### Prettify the NixOps manual.
-
-NIXOPS_MANUAL_IN = /no-such-path
-NIXOPS_MANUAL_OUT = nixops/manual
-
-all: $(NIXOPS_MANUAL_OUT)
-
-$(NIXOPS_MANUAL_OUT): $(call rwildcard, $(NIXOPS_MANUAL_IN), *) bootstrapify-docbook.sh bootstrapify-docbook.xsl layout.tt common.tt
-	bash ./bootstrapify-docbook.sh $(NIXOPS_MANUAL_IN) $(NIXOPS_MANUAL_OUT) 'NixOps manual' nixops https://github.com/NixOS/nixops/tree/master/doc/manual
-	ln -sfn manual.html $(NIXOPS_MANUAL_OUT)/index.html
-
-
 ### Prettify the Nixpkgs manual.
 
 NIXPKGS_MANUAL_IN = /no-such-path

diff --git a/common.tt b/common.tt
@@ -2,7 +2,7 @@
   nixManual = "/nix/manual"
   nixpkgsManual = "/nixpkgs/manual"
   nixosManual = "/nixos/manual"
-  nixopsManual = "/nixops/manual"
+  nixopsManual = "https://hydra.nixos.org/job/nixops/master/tarball/latest/download-by-type/doc/manual"
   nixPills = "/nixos/nix-pills"
   latestNixMirror = "https://nixos.org/releases/nix/nix-$latestNixVersion"
   latestNixOSBranch = "release-" _ latestNixOSSeries

diff --git a/disnix/examples.tt b/disnix/examples.tt
@@ -33,7 +33,7 @@ underlying infrastructure to support the services.
 </p>
 
 <p>
-With the following command you can use <a href="/nixops">NixOps</a> to deploy a network
+With the following command you can use <a href="https://github.com/NixOS/nixops">NixOps</a> to deploy a network
 of VirtualBox machines, and deploy the services with Disnix to them:
 </p>
 

diff --git a/disnix/extensions.tt b/disnix/extensions.tt
@@ -37,7 +37,7 @@ from a declarative specification of NixOS configurations.
 
 <p>
 DisnixOS combines the infrastructure deployment features of NixOS with Disnix.
-With DisnixOS you can first deploy a network of machines with <a href="/nixops">NixOps</a>
+With DisnixOS you can first deploy a network of machines with <a href="https://github.com/NixOS/nixops">NixOps</a>
 and deploy services inside them with Disnix. You can also deploy services in
 a network of generated virtual machines machines using the NixOS test driver
 and run testcases inside them.

diff --git a/flake.nix b/flake.nix
@@ -83,7 +83,6 @@
           [ "NIX_MANUAL_IN=${nix.defaultPackage.x86_64-linux}/share/doc/nix/manual"
             "NIXOS_MANUAL_IN=${nixpkgsStable.htmlDocs.nixosManual}"
             "NIXPKGS_MANUAL_IN=${nixpkgsStable.htmlDocs.nixpkgsManual}"
-            "NIXOPS_MANUAL_IN=${nixpkgsStable.legacyPackages.x86_64-linux.nixops}/share/doc/nixops"
             "NIXPKGS_STABLE=${packages.x86_64-linux.stablePackagesList}"
             "NIXPKGS_UNSTABLE=${packages.x86_64-linux.unstablePackagesList}"
             "NIXOS_OPTIONS=${packages.x86_64-linux.nixosOptions}/share/doc/nixos/options.json"

diff --git a/index.tt b/index.tt
@@ -70,7 +70,7 @@
         approach to system configuration management to networks and
         provisioning.
       </p>
-      <a class="learn-more" href="[%root%]/nixops">
+      <a class="learn-more" href="https://github.com/NixOS/nixops">
         More about NixOps
         <i class="fa fa-angle-right"></i>
       </a>

diff --git a/layout.tt b/layout.tt
@@ -47,8 +47,6 @@
                 Nix
               [% ELSIF menu == 'nixpkgs' %]
                 Nixpkgs
-              [% ELSIF menu == 'nixops' %]
-                NixOps
               [% ELSIF menu == 'disnix' %]
                 Disnix
               [% ELSE %]
@@ -61,7 +59,6 @@
               <li><a href="/">Site Home</a></li>
               <li><a href="[%root%]nixos">NixOS</a></li>
               <li><a href="[%root%]nix">Nix</a></li>
-              <li><a href="[%root%]nixops">NixOps</a></li>
               <li><a href="[%root%]nixpkgs">Nixpkgs</a></li>
               <li class="divider"></li>
               <li><a href="[%root%]disnix">Disnix</a></li>
@@ -99,12 +96,6 @@
               </ul>
               <ul class="nav pull-right">
                 <li><a href="https://github.com/NixOS/nixpkgs"><i class="fa fa-github"></i></a></li>
-            [% ELSIF menu == 'nixops' %]
-              <ul class="nav pull-left">
-                <li><a href="[%root%]nixops/manual/">Manual</a></li>
-              </ul>
-              <ul class="nav pull-right">
-                <li><a href="https://github.com/NixOS/nixops"><i class="fa fa-github"></i></a></li>
             [% ELSIF menu == 'disnix' %]
               <ul class="nav pull-left">
                 <li></li>

diff --git a/netlify.toml b/netlify.toml
@@ -33,3 +33,9 @@
   to = "https://github.com/NixOS/hydra"
   status = 301
   force = true
+
+[[redirects]]
+  from  = "/nixops"
+  to = "https://github.com/NixOS/nixops"
+  status = 301
+  force = true
diff --git a/nixops/index.tt b/nixops/index.tt
diff --git a/nixos/index.tt b/nixos/index.tt
@@ -45,7 +45,7 @@
     <h2>DevOps-friendly</h2>
     <p>Declarative specs and safe upgrades make NixOS a great system
     for DevOps use.  <a
-    href="[%root%]nixops"><strong>NixOps</strong></a>, the NixOS cloud
+    href="https://github.com/NixOS/nixops"><strong>NixOps</strong></a>, the NixOS cloud
     deployment tool, allows you to provision and manage networks of
     NixOS machines in environments like Amazon EC2 and VirtualBox.</p>
   </div>

diff --git a/nixos/learn.tt b/nixos/learn.tt
@@ -64,7 +64,7 @@
       manager</a>.</li>
       <li>The <a href="[%nixopsManual%]"><strong>NixOps
       manual</strong></a> describes how to deploy NixOS machine in the
-      cloud using <a href="[%root%]nixops">NixOps</a>.</li>
+      cloud using <a href="https://github.com/NixOS/nixops">NixOps</a>.</li>
     </ul>
   </div>