Skip to content

Commit 0af7193

Browse files
committed
prepare for release 0.14.0
1 parent 46a8c26 commit 0af7193

File tree

5 files changed

+29
-16
lines changed

5 files changed

+29
-16
lines changed

Diff for: doc/changelog.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
# v0.13.1 -> v0.x.x
1+
# v0.13.1 -> v0.14.0
2+
3+
## Tech Preview New API
4+
Release 0.14.0 comes with a tech preview of APIv2. This is the starting point of the seperating of the frontend and the backend and gives
5+
insight into what the future brings for Hashtopolis. We invite you to test it with the new web-ui and provide us with feedback. Be aware,
6+
it is a preview, it contains bugs and it will change; also it does not contain any permission checking. To use it, please see
7+
https://github.com/hashtopolis/server/wiki/Installation.
8+
9+
## Default installation method changed to Dockerimage
10+
With the release 0.14.0 the default installation method changed to Docker. Docker images are now available at https://hub.docker.com/hashtopolis
11+
212
## Bugfixes
313
- Setting 'Salt is in hex' during Hashlist creation will not set the --hex-salt flag (#892)
414

Diff for: docker-compose.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
version: '3.7'
22
services:
3-
hashtopolis-server:
4-
container_name: hashtopolis-server
5-
build:
6-
context: .
7-
target: hashtopolis-server-prod
8-
args:
9-
- CONTAINER_USER_CMD_PRE
10-
- CONTAINER_USER_CMD_POST
3+
hashtopolis-backend:
4+
container_name: hashtopolis-backend
5+
image: hashtopolis/backend:latest
116
restart: always
127
volumes:
138
- hashtopolis:/usr/local/share/hashtopolis:Z
@@ -18,6 +13,7 @@ services:
1813
HASHTOPOLIS_DB_DATABASE: $MYSQL_DATABASE
1914
HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER
2015
HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD
16+
HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE
2117
depends_on:
2218
- db
2319
ports:
@@ -33,12 +29,12 @@ services:
3329
MYSQL_DATABASE: $MYSQL_DATABASE
3430
MYSQL_USER: $MYSQL_USER
3531
MYSQL_PASSWORD: $MYSQL_PASSWORD
36-
hashtopolis-web-ui:
37-
container_name: hashtopolis-web-ui
38-
image: hashtopolis-web-ui:latest
32+
hashtopolis-frontend:
33+
container_name: hashtopolis-frontend
34+
image: hashtopolis/frontend:latest
3935
restart: always
4036
depends_on:
41-
- hashtopolis-server
37+
- hashtopolis-backend
4238
ports:
4339
- 4200:4200
4440
volumes:

Diff for: env.example

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ MYSQL_PASSWORD=hashtopolis
55

66
HASHTOPOLIS_ADMIN_USER=admin
77
HASHTOPOLIS_ADMIN_PASSWORD=hashtopolis
8-
HASHTOPOLIS_DB_HOST=db
8+
HASHTOPOLIS_DB_HOST=db
9+
10+
HASHTOPOLIS_APIV2_ENABLE=0

Diff for: src/api/v2/index.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<?php
22
declare(strict_types=1);
33

4+
$enabled = getenv('HASHTOPOLIS_APIV2_ENABLE');
5+
if (!$enabled || $enabled == 'false') {
6+
die("APIv2 is not enabled, it can be enabled via environment variable!");
7+
}
8+
49
date_default_timezone_set("UTC");
510
error_reporting(E_ALL);
611
ini_set("display_errors", '1');

Diff for: src/inc/info.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
$VERSION = "0.13.1";
3+
$VERSION = "0.14.0";
44
$BUILD = "repository";
55
$HOST = @$_SERVER['HTTP_HOST'];
66
if (strpos($HOST, ":") !== false) {
77
$HOST = substr($HOST, 0, strpos($HOST, ":"));
8-
}
8+
}

0 commit comments

Comments
 (0)