forked from kamba4/sunders
Compare commits
1 commit
3c4478eca3
...
7b3788b3ea
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b3788b3ea |
5 changed files with 51 additions and 10 deletions
|
|
@ -28,8 +28,7 @@ jobs:
|
||||||
if [ "${{ github.ref_name }}" = "main" ] && [ "${{ github.event_name }}" = "push" ]; then
|
if [ "${{ github.ref_name }}" = "main" ] && [ "${{ github.event_name }}" = "push" ]; then
|
||||||
echo "tag=latest" >> $GITHUB_OUTPUT
|
echo "tag=latest" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
# renovate creates sub branches with `/`; these break the tagging in the build process
|
echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT
|
||||||
echo tag=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/_/g') >> $GITHUB_OUTPUT
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Build web image
|
- name: Build web image
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,10 @@ services:
|
||||||
MYSQL_DATABASE: camera # ${{secrets.MYSQL_DATABASE}}
|
MYSQL_DATABASE: camera # ${{secrets.MYSQL_DATABASE}}
|
||||||
MYSQL_USER: camera # ${{secrets.MYSQL_USER}}
|
MYSQL_USER: camera # ${{secrets.MYSQL_USER}}
|
||||||
MYSQL_PASSWORD: camerapassword # ${{secrets.MYSQL_PASSWORD}}
|
MYSQL_PASSWORD: camerapassword # ${{secrets.MYSQL_PASSWORD}}
|
||||||
|
ports:
|
||||||
|
- "3306:3306"
|
||||||
volumes:
|
volumes:
|
||||||
- mariadb:/var/lib/mysql
|
- mariadb:/var/lib/mysql:Z
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"]
|
test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
|
|
@ -18,16 +20,16 @@ services:
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: git.hamburg.ccc.de/ccchh/sunders/web:latest
|
image: git.hamburg.ccc.de/ccchh/sunders/web:latest
|
||||||
|
build: ./web/
|
||||||
environment:
|
environment:
|
||||||
MYSQL_HOST: db
|
MYSQL_HOST: db
|
||||||
MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
|
MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
|
||||||
CAMERA_SELECT_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
|
MYSQL_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
|
||||||
CAMERA_SELECT_USER_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
|
MYSQL_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
|
||||||
DEFAULT_ZOOM: 12
|
DEFAULT_ZOOM: 12
|
||||||
DEFAULT_LAT: 0
|
DEFAULT_LAT: 0
|
||||||
DEFAULT_LON: 0
|
DEFAULT_LON: 0
|
||||||
DEFAULT_LANGUAGE: en
|
DEFAULT_LANGUAGE: en
|
||||||
IMPRESSUM_URL: https://hamburg.ccc.de/imprint/
|
|
||||||
ports:
|
ports:
|
||||||
- "8080:80"
|
- "8080:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
@ -36,6 +38,7 @@ services:
|
||||||
|
|
||||||
data_handler:
|
data_handler:
|
||||||
image: git.hamburg.ccc.de/ccchh/sunders/data_handler:latest
|
image: git.hamburg.ccc.de/ccchh/sunders/data_handler:latest
|
||||||
|
build: ./data_handler/
|
||||||
environment:
|
environment:
|
||||||
MYSQL_HOST: db
|
MYSQL_HOST: db
|
||||||
MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
|
MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
|
||||||
|
|
|
||||||
5
get_rate.sh
Normal file
5
get_rate.sh
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
before=$(ls migrations | wc -l)
|
||||||
|
sleep 60
|
||||||
|
after=$(ls migrations | wc -l)
|
||||||
|
let dif=after-before
|
||||||
|
echo "$dif"
|
||||||
|
|
@ -5,12 +5,11 @@
|
||||||
define('DEFAULT_LANGUAGE', getenv('DEFAULT_LANGUAGE') ?: 'en');
|
define('DEFAULT_LANGUAGE', getenv('DEFAULT_LANGUAGE') ?: 'en');
|
||||||
define('DEFAULT_PIE', 'country');
|
define('DEFAULT_PIE', 'country');
|
||||||
define('DEFAULT_TIME', 'single');
|
define('DEFAULT_TIME', 'single');
|
||||||
define('IMPRESSUM_URL', getenv('IMPRESSUM_URL') ?: '');
|
|
||||||
|
|
||||||
define('MYSQL_HOST', getenv('MYSQL_HOST') ?: '');
|
define('MYSQL_HOST', getenv('MYSQL_HOST') ?: '');
|
||||||
define('MYSQL_DB', getenv('MYSQL_DB') ?: '');
|
define('MYSQL_DB', getenv('MYSQL_DB') ?: '');
|
||||||
define('MYSQL_USER', getenv('CAMERA_SELECT_USER') ?: '');
|
define('MYSQL_USER', getenv('MYSQL_USER') ?: '');
|
||||||
define('MYSQL_PASSWORD', getenv('CAMERA_SELECT_USER_PASSWORD') ?: '');
|
define('MYSQL_PASSWORD', getenv('MYSQL_PASSWORD') ?: '');
|
||||||
|
|
||||||
define('USE_STATISTICS', false);
|
define('USE_STATISTICS', false);
|
||||||
?>
|
?>
|
||||||
|
|
@ -53,6 +53,7 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
|
<meta http-equiv="onion-location" content="http://sunders.ahcbagldgzdpa74g2mh74fvk5zjzpfjbvgqin6g3mfuu66tynv2gkiid.onion"/>
|
||||||
<meta charset="utf-8"/>
|
<meta charset="utf-8"/>
|
||||||
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
|
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
|
||||||
|
|
||||||
|
|
@ -231,13 +232,47 @@
|
||||||
<div class="slider-item slider-footer text-small">
|
<div class="slider-item slider-footer text-small">
|
||||||
❖ ❖ ❖
|
❖ ❖ ❖
|
||||||
<br><br><br>
|
<br><br><br>
|
||||||
|
<div class="slider-footer-title">
|
||||||
|
Onion Service
|
||||||
|
</div>
|
||||||
|
<div class="slider-onion-link">
|
||||||
|
<a href="http://sunders.ahcbagldgzdpa74g2mh74fvk5zjzpfjbvgqin6g3mfuu66tynv2gkiid.onion/">sunders ♥ onion</a>
|
||||||
|
</div>
|
||||||
|
<br><br>
|
||||||
|
❖
|
||||||
|
<br><br><br>
|
||||||
<?php
|
<?php
|
||||||
addListCredits($pathToWebFolder.'json/credits.json', $i18nCredits, $i18nCreditsDefault);
|
addListCredits($pathToWebFolder.'json/credits.json', $i18nCredits, $i18nCreditsDefault);
|
||||||
?>
|
?>
|
||||||
<br><br>
|
<br><br>
|
||||||
❖
|
❖
|
||||||
<br><br><br>
|
<br><br><br>
|
||||||
<a href="<?php echo IMPRESSUM_URL?>">Impressum</a>
|
МАКС КАМВАЧ<br>
|
||||||
|
Aljoscha Rompe Laan 5<br>
|
||||||
|
2517 AR Den Haag<br>
|
||||||
|
hello (<?php echo translate($i18nCommon, $i18nCommonDefault, 'at', [], [], []); ?>) sunders (<?php echo translate($i18nCommon, $i18nCommonDefault, 'dot', [], [], []); ?>) uber (<?php echo translate($i18nCommon, $i18nCommonDefault, 'dot', [], [], []); ?>) space<br><br>
|
||||||
|
<?php echo translate($i18nCommon, $i18nCommonDefault, 'footer-pgp', [$pathToWebFolder.'files/sunders.asc'], [], []); ?><br><br>
|
||||||
|
<div class="monospace">
|
||||||
|
8252 010B FDD9 5D6C DDD4<br>
|
||||||
|
7415 3800 574F FB00 4622<br><br>
|
||||||
|
</div>
|
||||||
|
<i>
|
||||||
|
<?php echo translate($i18nCommon, $i18nCommonDefault, 'footer-note', [], [], []); ?><br>
|
||||||
|
<?php echo translate($i18nCommon, $i18nCommonDefault, 'footer-your-key', [], [], []); ?><br>
|
||||||
|
<?php
|
||||||
|
if ($initialLanguage == 'de') {
|
||||||
|
echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', ['https://netzpolitik.org/2013/anleitung-so-verschlusselt-ihr-eure-e-mails-mit-pgp/'], [], []);
|
||||||
|
} elseif ($initialLanguage == 'es') {
|
||||||
|
echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', [], [['https://ssd.eff.org/es/module/como-usar-pgp-para-windows-pc', 'https://ssd.eff.org/es/module/c%C3%B3mo-usar-pgp-para-mac-os-x', 'https://ssd.eff.org/es/module/como-usar-pgp-para-linux'], ['Windows', 'macOS', 'GNU/Linux']], []);
|
||||||
|
} elseif ($initialLanguage == 'fr') {
|
||||||
|
echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', [], [['https://ssd.eff.org/fr/module/pgp-sous-windows-le-ba-ba', 'https://ssd.eff.org/fr/module/guide-dutilisation-de-pgp-pour-mac-os-x', 'https://ssd.eff.org/fr/module/pgp-sous-linux-le-ba-ba'], ['Windows', 'macOS', 'GNU/Linux']], []);
|
||||||
|
} elseif ($initialLanguage == 'ru') {
|
||||||
|
echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', [], [['https://ssd.eff.org/ru/module/%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-pgp-%D0%B4%D0%BB%D1%8F-windows', 'https://ssd.eff.org/ru/module/%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-pgp-%D0%B4%D0%BB%D1%8F-mac', 'https://ssd.eff.org/ru/module/%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-pgp-%D0%B4%D0%BB%D1%8F-linux'], ['Windows', 'macOS', 'GNU/Linux']], []);
|
||||||
|
} else {
|
||||||
|
echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', [], [['https://ssd.eff.org/en/module/how-use-pgp-windows', 'https://ssd.eff.org/en/module/how-use-pgp-mac-os-x', 'https://ssd.eff.org/en/module/how-use-pgp-linux'], ['Windows', 'macOS', 'GNU/Linux']], []);
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</i>
|
||||||
<br><br>
|
<br><br>
|
||||||
<?php echo translate($i18nCommon, $i18nCommonDefault, 'gdpr', [], [], []); ?>
|
<?php echo translate($i18nCommon, $i18nCommonDefault, 'gdpr', [], [], []); ?>
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue