Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ ARG RANETO_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"

ENV PORT=3000

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
Expand All @@ -33,7 +35,12 @@ RUN \
/app/raneto --strip-components=1 && \
echo "**** install raneto node dev modules and build ****" && \
cd /app/raneto && \
sed -i \
's/upgradeInsecureRequests: \[\]/upgradeInsecureRequests: null/g' \
app/index.js && \
npm install --omit=dev && \
mkdir sessions && \
rm -f config/config.js && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apk del --purge \
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ ARG RANETO_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"

ENV PORT=3000

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
Expand All @@ -33,7 +35,12 @@ RUN \
/app/raneto --strip-components=1 && \
echo "**** install raneto node dev modules and build ****" && \
cd /app/raneto && \
sed -i \
's/upgradeInsecureRequests: \[\]/upgradeInsecureRequests: null/g' \
app/index.js && \
npm install --omit=dev && \
mkdir sessions && \
rm -f config/config.js && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apk del --purge \
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ The default username and password is *admin/password*
This application can only be configured through file storage the web interface is only for editing Markdown files.
You need to understand the following paths and the role they play for the application:

* /config/config.default.js - Main configuration file to setup your user, site name, etc.
* /config/config/config.js - Main configuration file to setup your user, site name, etc.
* /config/content - All of your Markdown files go here [more info](http://docs.raneto.com/usage/creating-pages).
* /config/images - This folder will serve content on http://<your-ip>:3000/images/<image name>.png you can put anything in here but it is specifically for image files so you can embed them in your Markdown files without using external hosting.

Expand Down Expand Up @@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **16.09.25:** - Many changes for upstream release, if upgrading a new configuration file might be needed.
* **27.07.25:** - Rebase to Alpine 3.22.
* **01.02.25:** - Rebase to Alpine 3.21.
* **06.06.24:** - Rebase to Alpine 3.20.
Expand Down
3 changes: 2 additions & 1 deletion readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ app_setup_block: |
This application can only be configured through file storage the web interface is only for editing Markdown files.
You need to understand the following paths and the role they play for the application:

* /config/config.default.js - Main configuration file to setup your user, site name, etc.
* /config/config/config.js - Main configuration file to setup your user, site name, etc.
* /config/content - All of your Markdown files go here [more info](http://docs.raneto.com/usage/creating-pages).
* /config/images - This folder will serve content on http://<your-ip>:3000/images/<image name>.png you can put anything in here but it is specifically for image files so you can embed them in your Markdown files without using external hosting.
# init diagram
Expand Down Expand Up @@ -77,6 +77,7 @@ init_diagram: |
"raneto:latest" <- Base Images
# changelog
changelogs:
- {date: "16.09.25:", desc: "Many changes for upstream release, if upgrading a new configuration file might be needed."}
- {date: "27.07.25:", desc: "Rebase to Alpine 3.22."}
- {date: "01.02.25:", desc: "Rebase to Alpine 3.21."}
- {date: "06.06.24:", desc: "Rebase to Alpine 3.20."}
Expand Down
30 changes: 18 additions & 12 deletions root/defaults/config.default.js → root/defaults/config.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
// Modules
var path = require('path');
import path from 'node:path';

// Which Theme to Use?
//
// Local Directory Example (for development or custom themes)
// var theme_dir = path.join(__dirname, 'themes');
// var theme_name = 'my-theme-directory';
// const theme_dir = path.join(__dirname, 'themes');
// const theme_name = 'my-theme-directory';
//
// Themes from NPM
// use "dist" as the theme name for modules (for now)
var theme_dir = path.join(
'/app/raneto',
const __dirname = import.meta.dirname;
const app_root = process.cwd(); // This will be '/app/raneto' or similar
const theme_dir = path.join(
app_root,
'node_modules',
'@raneto/theme-default'
'@raneto/theme-default',
);
var theme_name = 'dist';
const theme_name = 'dist';

var config = {
const config = {
// Your site title (format: page_title - site_title)
site_title: 'Raneto Docs',

Expand All @@ -41,7 +43,7 @@ var config = {
support_email: '',

// Footer Text / Copyright
copyright: `Copyright &copy; ${new Date().getFullYear()} - <a href="https://raneto.com">Powered by Raneto</a>`,
copyright: `Copyright &copy; ${new Date().getFullYear()} Raneto Team`,

// Excerpt length (used in search)
excerpt_length: 400,
Expand All @@ -58,13 +60,17 @@ var config = {
// all categories or files that do not specify ShowOnHome meta property will be shown
show_on_home_default: true,

// Controls behavior of the menu if meta ShowOnMenu is not present. If set to true
// all categories or files that do not specify ShowOnMenu meta property will be shown
show_on_menu_default: true,

// Theme (see top of file)
theme_dir,
theme_name,

// Specify the path of your content folder where all your '.md' files are located
// Fix: Cannot be an absolute path
content_dir : '/config/content/',
content_dir: path.join(__dirname, '..', 'content', 'pages'),

// Where is the public directory or document root?
public_dir: path.join(theme_dir, theme_name, 'public'),
Expand Down Expand Up @@ -99,7 +105,7 @@ var config = {
oauth2: {
client_id: 'GOOGLE_CLIENT_ID',
client_secret: 'GOOGLE_CLIENT_SECRET',
callback: 'http://localhost:3000/auth/google/callback',
callback: 'http://localhost:8080/auth/google/callback',
hostedDomain: 'google.com',
},
secret: 'someCoolSecretRightHere',
Expand Down Expand Up @@ -166,4 +172,4 @@ var config = {
};

// Exports
module.exports = config;
export default config;
23 changes: 0 additions & 23 deletions root/defaults/server.js

This file was deleted.

14 changes: 8 additions & 6 deletions root/etc/s6-overlay/s6-rc.d/init-raneto-config/run
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
folders=(
/app/raneto/node_modules/@raneto/theme-default/dist/public/images
/app/raneto/content
/app/raneto/config
/app/raneto/sessions
)

for i in "${folders[@]}"; do
Expand All @@ -18,14 +20,14 @@ for i in "${folders[@]}"; do
fi
done

# create local user server files
if [[ ! -f /config/config.default.js ]]; then
cp /defaults/config.default.js /config/config.default.js
# upgrade support
if [[ -f /config/config.default.js ]]; then
mv /config/config.default.js /config/config/config.js
fi

if [[ -f "/defaults/server.js" ]]; then
rm -rf "/app/raneto/server.js"
mv "/defaults/server.js" "/app/raneto/server.js"
# copy default config
if [[ ! -f /config/config/config.js ]]; then
cp /defaults/config.js /config/config/config.js
fi

# permissions
Expand Down