Skip to content

Commit

Permalink
Merge branch 'website' of https://github.com/mixxxdj/website into new…
Browse files Browse the repository at this point in the history
…-in-2-3-serato
  • Loading branch information
Holzhaus committed Jul 2, 2020
2 parents 80040fc + 4e19364 commit 53ca8a3
Show file tree
Hide file tree
Showing 88 changed files with 4,404 additions and 2,078 deletions.
2 changes: 2 additions & 0 deletions _redirects
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/manual/* https://holzhaus-mixxx-manual.netlify.app/:splat 302
/* /error/ 404
2 changes: 1 addition & 1 deletion config.de-DE.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"prettify": true,
"locale": "de-de",
"site-url": "http://www.mixxx.org/de-DE/"
"site-url": "de-DE/"
}
2 changes: 1 addition & 1 deletion config.de.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"prettify": true,
"locale": "de",
"site-url": "http://www.mixxx.org/de/"
"site-url": "de/"
}
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"prettify": true,
"locale": "en",
"site-url": "http://www.mixxx.org/"
"site-url": ""
}
10 changes: 10 additions & 0 deletions netlify.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
# Build the site (outputs into .build directory)
cactus build -v

# Rename the ".build" directory to "build" (Netlify seems to have problems with
# the leading dot in the name)
mv .build build

# Copy redirect configuration to build directory
cp _redirects build/
14 changes: 14 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Settings in the [build] context are global and are applied to all contexts
# unless otherwise overridden by more specific contexts.
[build]
# Directory to change to before starting a build.
# This is where we will look for package.json/.nvmrc/etc.
base = ""

# Default build command.
command = "sh netlify.sh"

# Directory (relative to root of your repo) that contains the deploy-ready
# HTML files and assets generated by the build. If a base directory has
# been specified, include it in the publish directory path.
publish = "build/"
Loading

0 comments on commit 53ca8a3

Please sign in to comment.