Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
40f15e7676
|
||
|
|
980cc41dfd
|
||
|
|
9fdf596463 | ||
|
|
d43b5e08e6 | ||
|
|
4980670450 | ||
|
|
58b15e19b9 | ||
|
|
b73fc43e34
|
||
|
|
b597377818
|
||
|
|
6ebe151858 | ||
|
|
afa45119e5 | ||
|
|
b6875f45ea | ||
|
|
532c006fb4 | ||
|
|
623ed878dc | ||
|
|
6f366e9592 | ||
|
|
d3698fa2e4 | ||
|
|
1b26fcadbf | ||
|
|
4565620e30 | ||
|
|
c8fb5e120e | ||
|
|
4ea00e6deb | ||
|
|
22f37cbdec | ||
|
|
3cad468335 | ||
|
|
db5b344168 | ||
|
|
20593bdcf4 | ||
|
|
83411de473 | ||
|
|
11399aeef7 | ||
|
|
46abc9eeb5 | ||
|
|
2d8fd1bcb0 | ||
|
|
995c5fa94b | ||
|
|
c3a8b17a40 | ||
|
|
5af59498ba | ||
|
|
a2b3a14384 | ||
|
|
3f80e3f4a9 | ||
|
|
f28dbe82c9 | ||
|
|
3e7b3641ac | ||
|
|
66d18167d4 | ||
|
|
2830e17458 | ||
|
|
a19d61fcea | ||
|
|
7369288a16 | ||
|
|
5c5356f3d5 | ||
|
|
b1205edd48 | ||
|
|
bf2079f97d | ||
|
|
53dd634893 | ||
|
|
dea106e858 |
@@ -0,0 +1,3 @@
|
|||||||
|
hidche/game.env
|
||||||
|
hidche/account.env
|
||||||
|
hidche/docker-compose.override.yml
|
||||||
@@ -8,56 +8,60 @@ Docker-compose를 지원하는 모든 환경 (Windows 10 Pro 포함)
|
|||||||
|
|
||||||
Docker가 설치되지 않았다면 다음을 통해 설치합니다.
|
Docker가 설치되지 않았다면 다음을 통해 설치합니다.
|
||||||
|
|
||||||
* POSIX - https://docs.docker.com/install/ 을 통해 Docker를, https://docs.docker.com/compose/install/ 를 통해 Docker-compose를 설치합니다.
|
* POSIX - <https://docs.docker.com/install/> 을 통해 Docker를, <https://docs.docker.com/compose/install/> 를 통해 Docker-compose를 설치합니다.
|
||||||
|
|
||||||
* Windows 10 Pro 이상 - https://docs.docker.com/docker-for-windows/install/ 를 통해 Docker Desktop on Windows 를 설치합니다. 회원 가입을 원하지 않는다면, https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe 를 통해 설치합니다.
|
* Windows 10 - <https://docs.docker.com/docker-for-windows/install/> 를 통해 Docker Desktop on Windows 를 설치합니다. 회원 가입을 원하지 않는다면, <https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe> 를 통해 설치합니다.
|
||||||
|
|
||||||
> ⚠️**주의**: Docker Desktop on Windows는 Virtual Box, VMWare와 잘 호환되지 않는 것으로 알려져 있습니다.
|
> ⚠️**주의**: Docker Desktop on Windows는 Virtual Box, VMWare와 잘 호환되지 않는 것으로 알려져 있습니다.
|
||||||
만약 Virtual Box나 Virtual Box를 이용하는 안드로이드 가상 머신을 이용할 경우 Docker Toolbox를 설치하십시오.
|
만약 Virtual Box나 Virtual Box를 이용하는 안드로이드 가상 머신을 이용할 경우 Docker Toolbox를 설치하십시오.
|
||||||
|
|
||||||
* Windows 7, Windows 10 Home - https://github.com/docker/toolbox/releases 를 통해 Docker Toolbox를 설치합니다. https://docs.docker.com/toolbox/toolbox_install_windows/ 에 설치 안내가 있습니다.
|
세가지 모두 `docker run hello-world` 와 `docker-compose --version` 명령이 동작하면 설치가 완료된 것입니다.
|
||||||
|
|
||||||
세가지 모두 <code>docker run hello-world</code> 와 <code>docker-compose --version</code> 명령이 동작하면 설치가 완료된 것입니다.
|
|
||||||
|
|
||||||
## 설치
|
## 설치
|
||||||
|
|
||||||
docker, docker-compose를 사용 가능한 상황임을 가정합니다.
|
docker, docker-compose를 사용 가능한 상황임을 가정합니다.
|
||||||
|
|
||||||
https://storage.hided.net/gogs/devsam/docker/archive/master.zip 링크를 통해 zip 파일을 다운받아 압축을 풉니다.
|
<https://storage.hided.net/gitea/devsam/docker/archive/master.zip> 링크를 통해 zip 파일을 다운받아 압축을 풉니다.
|
||||||
|
|
||||||
### 기본 설정
|
### 기본 설정
|
||||||
|
|
||||||
기본적으로 수정이 필요한 항목은 다음과 같습니다.
|
기본적으로 수정이 필요한 항목은 다음과 같습니다.
|
||||||
|
|
||||||
- <code>hidche/account.env</code> : 계정정보 설정, 공란으로 남겨진 공간을 적절하게 채웁니다.
|
* `hidche/account.env` : 계정정보 설정, 공란으로 남겨진 공간을 적절하게 채웁니다.
|
||||||
- Password에 해당하는 항목들은 가급적 어렵게 지어주십시오.
|
* Password에 해당하는 항목들은 가급적 어렵게 지어주십시오.
|
||||||
- <code>HIDCHE_KAKAO_REST_KEY</code>, <code>HIDCHE_KAKAO_ADMIN_KEY</code>는 [KakaoTalk REST API](https://developers.kakao.com/docs/restapi/kakaotalk-api)를 통해 발급 받을 수 있습니다. 동의 항목으로는 카카오계정(이메일), 카카오톡 메시지 전송이 필요합니다.
|
* 특히 `HIDCHE_PW_SALT`는 자동 설치 시 1회만 사용되므로 최대한 길고 어렵게 지어주십시오.
|
||||||
- <code>hidche/game.env</code> : 게임 설치 정보 설정 공간입니다. 값 하나를 변경해야 합니다.
|
* `HIDCHE_KAKAO_REST_KEY`, `HIDCHE_KAKAO_ADMIN_KEY`는 [KakaoTalk REST API](https://developers.kakao.com/docs/restapi/kakaotalk-api)를 통해 발급 받을 수 있습니다. 동의 항목으로는 카카오계정(이메일), 카카오톡 메시지 전송이 필요합니다.
|
||||||
- <code>HIDCHE_GAME_PATH</code> : 외부 유저가 접속할 수 있는 경로입니다. 공인 IP 주소나 도메인 주소를 사용한 주소로 꼭 변경해야합니다. 변경하지 않을 경우 설치는 되지만, 외부 유저가 이용할 수 없습니다. 명확한 이유가 있는게 아니라면 <code>/sam</code> 까지 붙여주십시오.
|
* `HIDCHE_IMAGE_REQUEST_KEY`는 이미지 서비스용 git과 게임 git repository를 연동하기위한 키입니다. 특히 이미지 서비스가 다른 서버에서 실행될 때 유용합니다. 이 값이 지정되지 않은 경우 `image/hook/git_pull.php`을 PHP CLI를 통해 직접 실행해야만 합니다.
|
||||||
- 이 주소를 이용하여 카카오 API의 [로그인 Redirect URI](https://developers.kakao.com/apps/192309/settings/user#redirect-uri)를 설정해야 합니다. 주소가 https://sam.hided.net/sam 인 경우 https://sam.hided.net/sam/oauth_kakao/oauth.php 으로 입력합니다.
|
|
||||||
- 포트 주소는 8080으로 지정되어있으며, 다른 포트로 바꾸고자 한다면 <code>hidche/docker-compose.yml</code>와 동일하게 유지해야 합니다.
|
|
||||||
|
|
||||||
>Windows 환경에서 적절한 텍스트 에디터를 찾지 못하였다면 메모장에 해당 파일들을 드래그하여 수정하거나, [Notepad++](https://notepad-plus-plus.org/download/v7.7.1.html)를 설치하여 수정하는 방법도 가능합니다.
|
* `hidche/game.env` : 게임 설치 정보 설정 공간입니다. 값 하나를 변경해야 합니다.
|
||||||
|
* `HIDCHE_GAME_PATH` : 외부 유저가 접속할 수 있는 경로입니다. 공인 IP 주소나 도메인 주소를 사용한 주소로 꼭 변경해야합니다. 변경하지 않을 경우 설치는 되지만, 외부 유저가 이용할 수 없습니다. 명확한 이유가 있는게 아니라면 `/sam` 까지 붙여주십시오.
|
||||||
|
* 이 주소를 이용하여 카카오 API의 로그인 Redirect URI를 설정해야 합니다. 주소가 <https://sam.hided.net/sam> 인 경우 <https://sam.hided.net/sam/oauth_kakao/oauth.php> 으로 입력합니다.
|
||||||
|
* 포트 주소는 8080으로 지정되어있으며, 다른 포트로 바꾸고자 한다면 `hidche/docker-compose.yml`와 동일하게 유지해야 합니다.
|
||||||
|
|
||||||
|
>Windows 환경에서 적절한 텍스트 에디터를 찾지 못하였다면 메모장에 해당 파일들을 드래그하여 수정하거나, [Notepad++](https://notepad-plus-plus.org/downloads/ )를 설치하여 수정하는 방법도 가능합니다.
|
||||||
|
|
||||||
### 고급 설정
|
### 고급 설정
|
||||||
|
|
||||||
고급 설정이 필요하다면 다음을 수정합니다.
|
고급 설정이 필요하다면 다음을 수정합니다.
|
||||||
|
|
||||||
- <code>hidche/docker-compose.yml</code> : 설치 옵션입니다.
|
* `hidche/docker-compose.yml` : 설치 옵션입니다.
|
||||||
- <code>web/ports</code>: 8080 포트 대신 다른 포트를 선택하고자 할 경우 수정합니다. <code>hidche/game.env</code>의 내용도 변경해야합니다.
|
* `web/ports`: 8080 포트 대신 다른 포트를 선택하고자 할 경우 수정합니다. `hidche/game.env`의 내용도 변경해야합니다.
|
||||||
- <code>hidche/game.env</code>
|
* `build/args` : nginx/www-data의 UID와 GID를 변경할 수 있습니다. `web`, `app`, `board` 셋을 동시에 지정해야합니다.
|
||||||
- <code>gameGitPath</code>, <code>imgGitPath</code>: 개발을 위해 다른 git repository를 사용해야한다면 수정합니다. ssh 주소인 경우 <code>hidche/app/id_ecdsa</code>와 <code>hidche/app/known_hosts</code> 또한 수정해야 합니다.
|
* `hidche/game.env`
|
||||||
- <code>HIDCHE_IMAGE_USE_INTERNAL</code>, <code>HIDCHE_IMAGE_PATH</code>는 CDN 등 외부 이미지 경로를 사용할 경우 수정합니다.
|
* `gameGitPath`, `imgGitPath`: 개발을 위해 다른 git repository를 사용해야한다면 수정합니다. ssh 주소인 경우 `hidche/app/id_ecdsa`와 `hidche/app/known_hosts` 또한 수정해야 합니다.
|
||||||
- 기타 적절한 용도에 맞게 수정하여 사용합니다.
|
* `HIDCHE_IMAGE_USE_INTERNAL`, `HIDCHE_IMAGE_PATH`는 CDN 등 외부 이미지 경로를 사용할 경우 수정합니다.
|
||||||
|
* 기타 적절한 용도에 맞게 수정하여 사용합니다.
|
||||||
|
|
||||||
### Docker-compose 실행
|
### Docker-compose 실행
|
||||||
|
|
||||||
파일 설정이 모두 끝났다면, 콘솔에서 hidche 폴더로 이동하여 다음을 실행합니다.
|
파일 설정이 모두 끝났다면, 콘솔에서 hidche 폴더로 이동하여 다음을 실행합니다.
|
||||||
|
|
||||||
```
|
```bash
|
||||||
docker-compose up -d
|
docker-compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
총 5개의 컨테이너 <code>hidche_app_1</code>, <code>hidche_db_1</code>, <code>hidche_web_1</code>, <code>hidche_cron_1</code>, <code>hidche_install_1</code>가 실행되며, <code>hidche_install_1</code>는 설치후 종료됩니다.
|
총 6개의 컨테이너 `hidche_app_1`, `hidche_board_1`,`hidche_db_1`, `hidche_web_1`, `hidche_cron_1`, `hidche_install_1`가 실행되며, `hidche_install_1`는 설치후 종료됩니다.
|
||||||
|
|
||||||
설치 후, 게임을 이용할 수 있습니다.
|
설치 후, 게임을 이용할 수 있습니다.
|
||||||
|
|
||||||
|
게시판으로 Rhymix를 설치할 수 있도록 다운로드하며 설치 완료 된 주소에 `/board`를 붙여 게시판 설정을 마무리합니다.
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
|
|
||||||
#MYSQL 비밀번호. (필수)
|
|
||||||
MYSQL_ROOT_PASSWORD=
|
|
||||||
MYSQL_USER=hidche
|
|
||||||
MYSQL_PASSWORD=
|
|
||||||
HIDCHE_DB_PREFIX=hidche
|
|
||||||
|
|
||||||
|
|
||||||
#운영자 계정, 비밀번호.
|
|
||||||
HIDCHE_ADMIN=
|
|
||||||
HIDCHE_PASSWORD=
|
|
||||||
|
|
||||||
#카카오 로그인을 위한 API
|
|
||||||
HIDCHE_KAKAO_REST_KEY=
|
|
||||||
HIDCHE_KAKAO_ADMIN_KEY=
|
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
#MARIADB 비밀번호. (필수)
|
||||||
|
MARIADB_ROOT_PASSWORD=
|
||||||
|
#MARIADB ROOT 접근 주소(선택, 외부 접근 시 % 입력)
|
||||||
|
MARIADB_ROOT_HOST=
|
||||||
|
HIDCHE_PW_SALT=
|
||||||
|
HIDCHE_DB_PREFIX=hidche
|
||||||
|
|
||||||
|
#게시판 DB 비밀번호.
|
||||||
|
HIDCHE_DB_BBS_USER=board
|
||||||
|
HIDCHE_DB_BBS_PASSWORD=
|
||||||
|
|
||||||
|
#이미지 동기화 키. (16글자 이상, 빈칸인 경우 랜덤)
|
||||||
|
HIDCHE_IMAGE_REQUEST_KEY=
|
||||||
|
|
||||||
|
#운영자 계정, 비밀번호.
|
||||||
|
HIDCHE_ADMIN=
|
||||||
|
HIDCHE_PASSWORD=
|
||||||
|
|
||||||
|
#카카오 로그인을 위한 API
|
||||||
|
HIDCHE_KAKAO_REST_KEY=
|
||||||
|
HIDCHE_KAKAO_ADMIN_KEY=
|
||||||
+48
-31
@@ -1,14 +1,17 @@
|
|||||||
FROM php:7.3-fpm-buster
|
FROM php:8.2-fpm-bullseye
|
||||||
#debian
|
#debian
|
||||||
|
|
||||||
|
ENV LC_ALL=C.UTF-8
|
||||||
|
|
||||||
RUN apt -y update ;\
|
RUN apt -y update ;\
|
||||||
apt -y install \
|
apt -y install \
|
||||||
bzip2 git rsync \
|
bzip2 zip unzip p7zip-full git rsync \
|
||||||
libmemcached-dev libcurl4-openssl-dev libmcrypt-dev \
|
libmemcached-dev libcurl4-openssl-dev \
|
||||||
libicu-dev libjpeg-dev libpng-dev libwebp-dev libfreetype6-dev \
|
libicu-dev libjpeg-dev libpng-dev libwebp-dev libavif-dev libfreetype6-dev \
|
||||||
libzip-dev libxml2-dev libsqlite3-dev gosu;
|
libzip-dev libxml2-dev libsqlite3-dev gosu build-essential;
|
||||||
|
|
||||||
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
|
docker-php-ext-configure gd --with-freetype --with-webp --with-avif --with-jpeg --with-png ; \
|
||||||
docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd; \
|
docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd; \
|
||||||
docker-php-ext-configure mysqli --with-mysqli=mysqlnd; \
|
docker-php-ext-configure mysqli --with-mysqli=mysqlnd; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
@@ -16,38 +19,52 @@ RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
|||||||
gd \
|
gd \
|
||||||
intl \
|
intl \
|
||||||
opcache \
|
opcache \
|
||||||
|
sysvmsg \
|
||||||
|
sysvsem \
|
||||||
|
sysvshm \
|
||||||
pcntl \
|
pcntl \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
mysqli \
|
mysqli \
|
||||||
zip;
|
zip;
|
||||||
RUN pecl install memcached mcrypt;
|
RUN pecl install memcached ds;
|
||||||
|
|
||||||
|
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
|
||||||
|
apt install -yq nodejs
|
||||||
|
RUN npm install -g npm
|
||||||
|
|
||||||
#from nextcloud setting
|
#from nextcloud setting
|
||||||
RUN { \
|
RUN mkdir -p /var/www/html/; \
|
||||||
echo 'opcache.enable=1'; \
|
mkdir -p /var/www/.ssh;
|
||||||
echo 'opcache.interned_strings_buffer=8'; \
|
|
||||||
echo 'opcache.max_accelerated_files=10000'; \
|
COPY entrypoint.sh /usr/local/bin/
|
||||||
echo 'opcache.memory_consumption=128'; \
|
COPY id_ecdsa known_hosts /var/www/.ssh/
|
||||||
echo 'opcache.save_comments=1'; \
|
VOLUME /var/www/html
|
||||||
echo 'opcache.revalidate_freq=1'; \
|
|
||||||
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
|
ARG UID=33
|
||||||
\
|
ARG GID=33
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
|
||||||
\
|
RUN if [ "$UID" != 33 ]; then \
|
||||||
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
|
usermod -u $UID -o www-data; \
|
||||||
\
|
fi; \
|
||||||
mkdir -p /var/www/data; \
|
if [ "$GID" != 33 ]; then \
|
||||||
chown -R www-data:root /var/www; \
|
groupmod -g $GID -o www-data; \
|
||||||
|
fi; \
|
||||||
|
echo $UID > /var/tmp.txt ; \
|
||||||
|
chmod +x /usr/local/bin/entrypoint.sh; \
|
||||||
|
mkdir -p /var/www/opcache; \
|
||||||
|
chown -R www-data:www-data /var/www; \
|
||||||
chmod -R g=u /var/www; \
|
chmod -R g=u /var/www; \
|
||||||
mkdir -p /var/www/.ssh; \
|
mkdir -p /var/www/.ssh; \
|
||||||
chown www-data:www-data /var/www/.ssh; \
|
chown www-data:www-data /var/www/.ssh; \
|
||||||
chmod 700 /var/www/.ssh
|
chmod 700 /var/www/.ssh; \
|
||||||
|
|
||||||
VOLUME /var/www/html
|
|
||||||
|
|
||||||
COPY entrypoint_hidche_app.sh /usr/local/bin/
|
|
||||||
COPY id_ecdsa known_hosts /var/www/.ssh/
|
|
||||||
RUN \
|
|
||||||
chown www-data:www-data /var/www/.ssh/*; \
|
|
||||||
chmod 600 /var/www/.ssh/*;
|
chmod 600 /var/www/.ssh/*;
|
||||||
ENTRYPOINT ["entrypoint_hidche_app.sh"]
|
|
||||||
|
COPY sam_conf.ini /usr/local/etc/php/conf.d/sam_conf.ini
|
||||||
|
|
||||||
|
# SETUP PHP-FPM CONFIG SETTINGS (max_children / max_requests)
|
||||||
|
RUN echo 'pm.max_children = 15' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
||||||
|
echo 'pm.max_requests = 500' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
||||||
|
echo 'request_terminate_timeout = 600' >> /usr/local/etc/php-fpm.d/zz-docker.conf
|
||||||
|
|
||||||
|
ENTRYPOINT ["entrypoint.sh"]
|
||||||
CMD ["php-fpm"]
|
CMD ["php-fpm"]
|
||||||
Executable
+32
@@ -0,0 +1,32 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -euxo pipefail
|
||||||
|
shopt -s nullglob
|
||||||
|
|
||||||
|
cp -n /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
|
||||||
|
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
printf "[PHP]\ndate.timezone = \"$TZ\"\n" > /usr/local/etc/php/conf.d/tzone.ini
|
||||||
|
|
||||||
|
wwwRoot="/var/www"
|
||||||
|
samRoot="$wwwRoot/html/sam"
|
||||||
|
imageRoot="$wwwRoot/html/image"
|
||||||
|
if [ ! -f "$samRoot/index.php" ]; then
|
||||||
|
echo generate $samRoot
|
||||||
|
mkdir -p $samRoot
|
||||||
|
chown -R www-data:www-data $wwwRoot
|
||||||
|
gosu www-data git clone $gameGitPath $samRoot
|
||||||
|
gosu www-data git checkout $gameGitBranch
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$HIDCHE_IMAGE_USE_INTERNAL" = "yes" ] && [ ! -d "$imageRoot" ]; then
|
||||||
|
if [[ "$imgGitPath" =~ ^ssh ]]; then
|
||||||
|
query=`echo "<?php \\\$a=parse_url('$imgGitPath');echo join(' ', [\\\$a['port']?'-p '.\\\$a['port']:'',\\\$a['host']]);" | php`
|
||||||
|
gosu www-data ssh-keyscan $query >> /var/www/.ssh/known_hosts 2>/dev/null;
|
||||||
|
gosu www-data chmod 600 /var/www/.ssh/known_hosts
|
||||||
|
fi
|
||||||
|
echo generate $imageRoot
|
||||||
|
mkdir -p $imageRoot
|
||||||
|
chown -R www-data:www-data $imageRoot
|
||||||
|
gosu www-data git clone $imgGitPath $imageRoot
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec "$@"
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
shopt -s nullglob
|
|
||||||
|
|
||||||
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
|
||||||
printf "[PHP]\ndate.timezone = \"$TZ\"\n" > /usr/local/etc/php/conf.d/tzone.ini
|
|
||||||
|
|
||||||
wwwRoot="/var/www/html"
|
|
||||||
samRoot="$wwwRoot/sam"
|
|
||||||
imageRoot="$wwwRoot/image"
|
|
||||||
|
|
||||||
if [ ! -f "$samRoot/index.php" ]; then
|
|
||||||
gosu www-data git clone $gameGitPath /var/www/html/sam
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $HIDCHE_IMAGE_USE_INTERNAL = "yes" ] && [ ! -d "$imageRoot" ]; then
|
|
||||||
if [[ "$imageRoot" =~ ^ssh ]]; then
|
|
||||||
query=`echo "<?php \\\$a=parse_url('$imageRoot');echo join(' ', [\\\$a['port']?'-p '.\\\$a['port']:'',\\\$a['host']]);" | php`
|
|
||||||
ssh-keyscan $query >> /var/www/.ssh/known_hosts 2>/dev/null;
|
|
||||||
chown www-data:www-data /var/www/.ssh/known_hosts
|
|
||||||
chmod 600 /var/www/.ssh/known_hosts
|
|
||||||
fi
|
|
||||||
gosu www-data git clone $imgGitPath /var/www/html/image
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
[storage.hided.net]:2525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCb9BLlqXb8jsnho4Db6WTMQOnhjxC42lanowDicTjzaan7JgTrRxFbrLL8zUcqMhNpFBqD9oUxV2gKD00/BoVtXEbjKoa+GjKtDyU+RfejaAw4j+nVZjyjvXoIKMyzr6NqjA3mLdcd47KLZKtFQNKcOL00foMsqYJhmr75UM6scfCj8+KnjVLkNdlFtJ9fGlnA1FGmEoldHR+htN01E/Yx8teHQGo5W0hZ/tOvE+r7NWA2PXFqOrb+IXe3URVndDZb1idInQDuMRetrWgCEZSy4/sTIss030wkHkUdDuLCt2NnUvLEVlxvpQw72k9j/nRapkGthwN7x1L8yQYKY6iv|1|XTprP1yTMznxEkakYqFoyNVBs7A=|8wea12ZyJ0L/nHHQ3nEtWJHlikA= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCb9BLlqXb8jsnho4Db6WTMQOnhjxC42lanowDicTjzaan7JgTrRxFbrLL8zUcqMhNpFBqD9oUxV2gKD00/BoVtXEbjKoa+GjKtDyU+RfejaAw4j+nVZjyjvXoIKMyzr6NqjA3mLdcd47KLZKtFQNKcOL00foMsqYJhmr75UM6scfCj8+KnjVLkNdlFtJ9fGlnA1FGmEoldHR+htN01E/Yx8teHQGo5W0hZ/tOvE+r7NWA2PXFqOrb+IXe3URVndDZb1idInQDuMRetrWgCEZSy4/sTIss030wkHkUdDuLCt2NnUvLEVlxvpQw72k9j/nRapkGthwN7x1L8yQYKY6iv
|
|1|F5PQuvYtsnOvlFTYbXrlNmbTc0k=|+Vc0k0gtOlfd4YXjch2Q6fKhVYc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhcLxpNyRN/3Re7jLUooHW9UYvlWjgp7OUCUFBMDqKnc/JHjiPV1qA1aKcdc5RYEir0dxSj8EAywNV5AakGlcuLibHjP8m/DK4tjAs6EuNGhbqOn4H5M/mEwJHvBPS06BlsMpFG69E9v+E6DQ27fc+AN84LNkG3C5BUSIOFDlUJVS2GoldxxIEXD2WopFBqfffei8ze7sBNbJ/LZ1O4N3NRLWKAalUbJT/L+UVIL3uNOuEzDcNyra+VvfFamwV55X323+QxXYBY3EVnAT4+JyuEp7cxlAHEjC68c2iJ5vWXlCjxXCA6EN7i/UPDD7+bP8KD/9vd9LkEpfTcN22Sns3
|
||||||
|1|3UOicj4TheEV6TEnSfmHNKhpuWU=|EL7zXO8enUCmq5tmi4WlxuEp2BM= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCb9BLlqXb8jsnho4Db6WTMQOnhjxC42lanowDicTjzaan7JgTrRxFbrLL8zUcqMhNpFBqD9oUxV2gKD00/BoVtXEbjKoa+GjKtDyU+RfejaAw4j+nVZjyjvXoIKMyzr6NqjA3mLdcd47KLZKtFQNKcOL00foMsqYJhmr75UM6scfCj8+KnjVLkNdlFtJ9fGlnA1FGmEoldHR+htN01E/Yx8teHQGo5W0hZ/tOvE+r7NWA2PXFqOrb+IXe3URVndDZb1idInQDuMRetrWgCEZSy4/sTIss030wkHkUdDuLCt2NnUvLEVlxvpQw72k9j/nRapkGthwN7x1L8yQYKY6iv
|
|1|937xmet4gCqPCNCXV+/5ob1kaT4=|dnau7j/74oG1D6ETIy550OddgrI= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhcLxpNyRN/3Re7jLUooHW9UYvlWjgp7OUCUFBMDqKnc/JHjiPV1qA1aKcdc5RYEir0dxSj8EAywNV5AakGlcuLibHjP8m/DK4tjAs6EuNGhbqOn4H5M/mEwJHvBPS06BlsMpFG69E9v+E6DQ27fc+AN84LNkG3C5BUSIOFDlUJVS2GoldxxIEXD2WopFBqfffei8ze7sBNbJ/LZ1O4N3NRLWKAalUbJT/L+UVIL3uNOuEzDcNyra+VvfFamwV55X323+QxXYBY3EVnAT4+JyuEp7cxlAHEjC68c2iJ5vWXlCjxXCA6EN7i/UPDD7+bP8KD/9vd9LkEpfTcN22Sns3
|
||||||
|1|M8V56tJHA+xiw51scQfhSs5nZeE=|wIw/fQk0MR3l7Bo3Mqd0zR+S4rE= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCb9BLlqXb8jsnho4Db6WTMQOnhjxC42lanowDicTjzaan7JgTrRxFbrLL8zUcqMhNpFBqD9oUxV2gKD00/BoVtXEbjKoa+GjKtDyU+RfejaAw4j+nVZjyjvXoIKMyzr6NqjA3mLdcd47KLZKtFQNKcOL00foMsqYJhmr75UM6scfCj8+KnjVLkNdlFtJ9fGlnA1FGmEoldHR+htN01E/Yx8teHQGo5W0hZ/tOvE+r7NWA2PXFqOrb+IXe3URVndDZb1idInQDuMRetrWgCEZSy4/sTIss030wkHkUdDuLCt2NnUvLEVlxvpQw72k9j/nRapkGthwN7x1L8yQYKY6iv
|
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
expose_php = Off
|
||||||
|
max_execution_time = 300
|
||||||
|
pdo_mysql.cache_size = 2000
|
||||||
|
mysqli.cache_size = 2000
|
||||||
|
memory_limit=512M
|
||||||
|
|
||||||
|
apc.enable_cli=1
|
||||||
|
|
||||||
|
opcache.enable=1
|
||||||
|
opcache.jit_buffer_size=100M
|
||||||
|
opcache.interned_strings_buffer=8
|
||||||
|
opcache.max_accelerated_files=10000
|
||||||
|
opcache.validate_timestamps=on
|
||||||
|
opcache.memory_consumption=128
|
||||||
|
opcache.save_comments=1
|
||||||
|
opcache.revalidate_freq=1
|
||||||
|
opcache.file_cache="/var/www/opcache"
|
||||||
|
opcache.jit="function"
|
||||||
|
|
||||||
|
extension=ds.so
|
||||||
|
extension=memcached.so
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
FROM python:3-alpine
|
||||||
|
#alpine + python3 + cron(from alpine) + mariadb-client
|
||||||
|
RUN apk add --no-cache mariadb-client rsync
|
||||||
|
|
||||||
|
COPY run_backup.py /usr/local/bin/
|
||||||
|
RUN chmod +x /usr/local/bin/run_backup.py && \
|
||||||
|
echo '0 5 * * * python3 /usr/local/bin/run_backup.py' > /etc/crontabs/root
|
||||||
|
|
||||||
|
ENTRYPOINT []
|
||||||
|
CMD ["crond", "-f" , "-L", "/dev/stdout"]
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
import os
|
||||||
|
import os.path
|
||||||
|
from subprocess import Popen, PIPE, run as subprocess_run
|
||||||
|
from datetime import datetime
|
||||||
|
from multiprocessing.dummy import Pool as ThreadPool
|
||||||
|
|
||||||
|
def backup_table(db_name, table_name, output_prefix):
|
||||||
|
sql_path = '{}/{}/{}.sql.gz'.format(output_prefix, db_name, table_name)
|
||||||
|
#print(sql_path)
|
||||||
|
with open(sql_path, 'wb') as sql_out:
|
||||||
|
sqldump = Popen(['mysqldump', '-f', '--skip-comments', '-h', 'db', '-u', 'root', '--password={}'.format(root_pw), db_name, table_name], stdout=PIPE)
|
||||||
|
gzdump = Popen(['gzip', '-c'], stdin=sqldump.stdout, stdout=sql_out)
|
||||||
|
sqldump.wait()
|
||||||
|
gzdump.wait()
|
||||||
|
os.chmod(sql_path, 0o644)
|
||||||
|
print('sql done {}, {}'.format(db_name, table_name))
|
||||||
|
|
||||||
|
def backup_files(src_path, output_path):
|
||||||
|
subprocess_run(['rsync', '-au', src_path, output_path])
|
||||||
|
print('file done {}'.format(src_path))
|
||||||
|
|
||||||
|
now = datetime.now()
|
||||||
|
print('> backup begin', now.isoformat())
|
||||||
|
weekday = now.weekday()
|
||||||
|
hour = now.hour
|
||||||
|
|
||||||
|
store_path = '/var/backup'
|
||||||
|
output_prefix = '{}/hidche_backup_w{}-{:02}'.format(store_path, weekday, hour)
|
||||||
|
|
||||||
|
os.makedirs(output_prefix, exist_ok=True)
|
||||||
|
|
||||||
|
db_prefix = os.environ['HIDCHE_DB_PREFIX']
|
||||||
|
server_list = os.environ['HIDCHE_SERVER_LIST'].strip(' ,').split(',')
|
||||||
|
server_list.append('root')
|
||||||
|
|
||||||
|
board_db_name = os.environ['HIDCHE_DB_BBS_USER']
|
||||||
|
server_list.append(board_db_name)
|
||||||
|
#print(server_list)
|
||||||
|
|
||||||
|
root_pw = os.environ['MARIADB_ROOT_PASSWORD']
|
||||||
|
|
||||||
|
board_files_path = os.environ.get('HIDCHE_BOARD_FILES_PATH', '/var/www/board/files')
|
||||||
|
|
||||||
|
with ThreadPool(4) as pool:
|
||||||
|
waiters = []
|
||||||
|
waiters.append(pool.apply_async(backup_files, ('/var/www/html/sam/d_pic', '{}/sam_image'.format(output_prefix))))
|
||||||
|
print(board_files_path)
|
||||||
|
if os.path.exists(board_files_path):
|
||||||
|
waiters.append(pool.apply_async(backup_files, (board_files_path, '{}/board_files'.format(output_prefix))))
|
||||||
|
|
||||||
|
for server_name in server_list:
|
||||||
|
db_name = '{}_{}'.format(db_prefix, server_name)
|
||||||
|
raw_tables = subprocess_run(['mysql', '-NBA' , '-h' ,'db', '-u', 'root' ,'--password={}'.format(root_pw), '-D', db_name, '-e', 'show tables'], stdout=PIPE)
|
||||||
|
raw_tables = raw_tables.stdout.decode('utf-8').strip(' \n\t')
|
||||||
|
if raw_tables == '':
|
||||||
|
continue
|
||||||
|
|
||||||
|
tables = raw_tables.split('\n')
|
||||||
|
d_setting_path = '/var/www/html/sam/{}/d_setting'.format(server_name)
|
||||||
|
|
||||||
|
if os.path.exists(d_setting_path):
|
||||||
|
waiters.append(pool.apply_async(backup_files, (d_setting_path, '{}/{}'.format(output_prefix, db_name))))
|
||||||
|
|
||||||
|
os.makedirs('{}/{}'.format(output_prefix, db_name), exist_ok=True)
|
||||||
|
for table_name in tables:
|
||||||
|
waiters.append(pool.apply_async(backup_table, (db_name, table_name, output_prefix)))
|
||||||
|
for waiter in waiters:
|
||||||
|
waiter.wait()
|
||||||
|
|
||||||
|
print('> backup finish', datetime.now().isoformat())
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
FROM php:8.2-fpm-bullseye
|
||||||
|
#debian
|
||||||
|
|
||||||
|
ENV LC_ALL=C.UTF-8
|
||||||
|
|
||||||
|
RUN apt -y update ;\
|
||||||
|
apt -y install \
|
||||||
|
bzip2 zip unzip p7zip-full git rsync \
|
||||||
|
libmemcached-dev libcurl4-openssl-dev \
|
||||||
|
libicu-dev libjpeg-dev libpng-dev libwebp-dev libavif-dev libfreetype6-dev \
|
||||||
|
libzip-dev libxml2-dev libsqlite3-dev gosu build-essential;
|
||||||
|
|
||||||
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
|
docker-php-ext-configure gd --with-freetype --with-webp --with-avif --with-jpeg --with-png ; \
|
||||||
|
docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd; \
|
||||||
|
docker-php-ext-configure mysqli --with-mysqli=mysqlnd; \
|
||||||
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
|
exif \
|
||||||
|
gd \
|
||||||
|
intl \
|
||||||
|
opcache \
|
||||||
|
pcntl \
|
||||||
|
pdo_mysql \
|
||||||
|
mysqli \
|
||||||
|
zip;
|
||||||
|
RUN pecl install memcached ds;
|
||||||
|
#from nextcloud setting
|
||||||
|
RUN mkdir -p /var/www/board; \
|
||||||
|
mkdir -p /var/www/.ssh;
|
||||||
|
|
||||||
|
COPY entrypoint.sh /usr/local/bin/
|
||||||
|
|
||||||
|
VOLUME /var/www/board
|
||||||
|
|
||||||
|
ARG UID=33
|
||||||
|
ARG GID=33
|
||||||
|
|
||||||
|
RUN if [ "$UID" != 33 ]; then \
|
||||||
|
usermod -u $UID -o www-data; \
|
||||||
|
fi; \
|
||||||
|
if [ "$GID" != 33 ]; then \
|
||||||
|
groupmod -g $GID -o www-data; \
|
||||||
|
fi; \
|
||||||
|
chmod +x /usr/local/bin/entrypoint.sh; \
|
||||||
|
chown -R www-data:www-data /var/www; \
|
||||||
|
chmod -R g=u /var/www; \
|
||||||
|
mkdir -p /var/www/.ssh; \
|
||||||
|
chown www-data:www-data /var/www/.ssh;
|
||||||
|
|
||||||
|
COPY sam_conf.ini /usr/local/etc/php/conf.d/sam_conf.ini
|
||||||
|
|
||||||
|
ENTRYPOINT ["entrypoint.sh"]
|
||||||
|
CMD ["php-fpm"]
|
||||||
Executable
+19
@@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -euxo pipefail
|
||||||
|
shopt -s nullglob
|
||||||
|
|
||||||
|
cp -n /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
|
||||||
|
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
printf "[PHP]\ndate.timezone = \"$TZ\"\n" > /usr/local/etc/php/conf.d/tzone.ini
|
||||||
|
|
||||||
|
|
||||||
|
wwwRoot="/var/www"
|
||||||
|
bbsRoot="$wwwRoot/board"
|
||||||
|
|
||||||
|
if [ ! -e "$bbsRoot/index.php" ]; then
|
||||||
|
mkdir -p $bbsRoot
|
||||||
|
chown -R www-data:www-data $bbsRoot
|
||||||
|
gosu www-data git clone https://github.com/rhymix/rhymix.git $bbsRoot
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec "$@"
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
[PHP]
|
||||||
|
expose_php = Off
|
||||||
|
|
||||||
|
[Pdo_mysql]
|
||||||
|
pdo_mysql.cache_size = 2000
|
||||||
|
|
||||||
|
[MySQLi]
|
||||||
|
mysqli.cache_size = 2000
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
echo '* * * * * python3 /var/www/html/sam/src/run_daemon.py' | crontab - && crond -f -L /dev/stdout
|
echo '*/2 * * * * python3 /var/www/html/sam/src/run_daemon.py
|
||||||
|
1-59/2 * * * * python3 /var/www/html/sam/src/run_daemon.py' | crontab - && crond -f -L /dev/stdout
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
FROM mariadb
|
FROM mariadb
|
||||||
#ubuntu
|
#ubuntu
|
||||||
|
|
||||||
COPY entrypoint_hidche_db.sh /usr/local/bin/
|
COPY entrypoint.sh /usr/local/bin/
|
||||||
RUN chmod +x /usr/local/bin/entrypoint_hidche_db.sh
|
RUN chmod +x /usr/local/bin/entrypoint.sh
|
||||||
ENTRYPOINT ["entrypoint_hidche_db.sh"]
|
ENTRYPOINT ["entrypoint.sh"]
|
||||||
|
|
||||||
|
|
||||||
EXPOSE 3306
|
EXPOSE 3306
|
||||||
|
|||||||
@@ -0,0 +1,428 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -eo pipefail
|
||||||
|
shopt -s nullglob
|
||||||
|
|
||||||
|
# logging functions
|
||||||
|
mysql_log() {
|
||||||
|
local type="$1"; shift
|
||||||
|
printf '%s [%s] [Entrypoint]: %s\n' "$(date --rfc-3339=seconds)" "$type" "$*"
|
||||||
|
}
|
||||||
|
mysql_note() {
|
||||||
|
mysql_log Note "$@"
|
||||||
|
}
|
||||||
|
mysql_warn() {
|
||||||
|
mysql_log Warn "$@" >&2
|
||||||
|
}
|
||||||
|
mysql_error() {
|
||||||
|
mysql_log ERROR "$@" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# usage: file_env VAR [DEFAULT]
|
||||||
|
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
|
||||||
|
# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
|
||||||
|
# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
|
||||||
|
file_env() {
|
||||||
|
local var="$1"
|
||||||
|
local fileVar="${var}_FILE"
|
||||||
|
local def="${2:-}"
|
||||||
|
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
||||||
|
mysql_error "Both $var and $fileVar are set (but are exclusive)"
|
||||||
|
fi
|
||||||
|
local val="$def"
|
||||||
|
if [ "${!var:-}" ]; then
|
||||||
|
val="${!var}"
|
||||||
|
elif [ "${!fileVar:-}" ]; then
|
||||||
|
val="$(< "${!fileVar}")"
|
||||||
|
fi
|
||||||
|
export "$var"="$val"
|
||||||
|
unset "$fileVar"
|
||||||
|
}
|
||||||
|
|
||||||
|
# set MARIADB_xyz from MYSQL_xyz when MARIADB_xyz is unset
|
||||||
|
# and make them the same value (so user scripts can use either)
|
||||||
|
_mariadb_file_env() {
|
||||||
|
local var="$1"; shift
|
||||||
|
local maria="MARIADB_${var#MYSQL_}"
|
||||||
|
file_env "$var" "$@"
|
||||||
|
file_env "$maria" "${!var}"
|
||||||
|
if [ "${!maria:-}" ]; then
|
||||||
|
export "$var"="${!maria}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# check to see if this file is being run or sourced from another script
|
||||||
|
_is_sourced() {
|
||||||
|
# https://unix.stackexchange.com/a/215279
|
||||||
|
[ "${#FUNCNAME[@]}" -ge 2 ] \
|
||||||
|
&& [ "${FUNCNAME[0]}" = '_is_sourced' ] \
|
||||||
|
&& [ "${FUNCNAME[1]}" = 'source' ]
|
||||||
|
}
|
||||||
|
|
||||||
|
#modifed
|
||||||
|
file_env 'TZ'
|
||||||
|
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
|
||||||
|
#modifed
|
||||||
|
hidcheDBList=("root" "che" "kwe" "pwe" "twe" "nya" "pya" "hwe")
|
||||||
|
|
||||||
|
# usage: docker_process_init_files [file [file [...]]]
|
||||||
|
# ie: docker_process_init_files /always-initdb.d/*
|
||||||
|
# process initializer files, based on file extensions
|
||||||
|
docker_process_init_files() {
|
||||||
|
# mysql here for backwards compatibility "${mysql[@]}"
|
||||||
|
mysql=( docker_process_sql )
|
||||||
|
|
||||||
|
echo
|
||||||
|
local f
|
||||||
|
for f; do
|
||||||
|
case "$f" in
|
||||||
|
*.sh)
|
||||||
|
# https://github.com/docker-library/postgres/issues/450#issuecomment-393167936
|
||||||
|
# https://github.com/docker-library/postgres/pull/452
|
||||||
|
if [ -x "$f" ]; then
|
||||||
|
mysql_note "$0: running $f"
|
||||||
|
"$f"
|
||||||
|
else
|
||||||
|
mysql_note "$0: sourcing $f"
|
||||||
|
. "$f"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;;
|
||||||
|
*.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
|
||||||
|
*.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
|
||||||
|
*.sql.zst) mysql_note "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;;
|
||||||
|
*) mysql_warn "$0: ignoring $f" ;;
|
||||||
|
esac
|
||||||
|
echo
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
# arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values)
|
||||||
|
_verboseHelpArgs=(
|
||||||
|
--verbose --help
|
||||||
|
--log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136
|
||||||
|
)
|
||||||
|
|
||||||
|
mysql_check_config() {
|
||||||
|
local toRun=( "$@" "${_verboseHelpArgs[@]}" ) errors
|
||||||
|
if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
|
||||||
|
mysql_error $'mariadbd failed while attempting to check config\n\tcommand was: '"${toRun[*]}"$'\n\t'"$errors"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Fetch value from server config
|
||||||
|
# We use mariadbd --verbose --help instead of my_print_defaults because the
|
||||||
|
# latter only show values present in config files, and not server defaults
|
||||||
|
mysql_get_config() {
|
||||||
|
local conf="$1"; shift
|
||||||
|
"$@" "${_verboseHelpArgs[@]}" 2>/dev/null \
|
||||||
|
| awk -v conf="$conf" '$1 == conf && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
|
||||||
|
# match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
|
docker_temp_server_start() {
|
||||||
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF &
|
||||||
|
mysql_note "Waiting for server startup"
|
||||||
|
# only use the root password if the database has already been initializaed
|
||||||
|
# so that it won't try to fill in a password file when it hasn't been set yet
|
||||||
|
extraArgs=()
|
||||||
|
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
|
||||||
|
extraArgs+=( '--dont-use-mysql-root-password' )
|
||||||
|
fi
|
||||||
|
local i
|
||||||
|
for i in {30..0}; do
|
||||||
|
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
if [ "$i" = 0 ]; then
|
||||||
|
mysql_error "Unable to start server."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Stop the server. When using a local socket file mysqladmin will block until
|
||||||
|
# the shutdown is complete.
|
||||||
|
docker_temp_server_stop() {
|
||||||
|
if ! MYSQL_PWD=$MARIADB_ROOT_PASSWORD mysqladmin shutdown -uroot --socket="${SOCKET}"; then
|
||||||
|
mysql_error "Unable to shut down server."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Verify that the minimally required password settings are set for new databases.
|
||||||
|
docker_verify_minimum_env() {
|
||||||
|
if [ -z "$MARIADB_ROOT_PASSWORD" -a -z "$MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" -a -z "$MARIADB_RANDOM_ROOT_PASSWORD" ]; then
|
||||||
|
mysql_error $'Database is uninitialized and password option is not specified\n\tYou need to specify one of MARIADB_ROOT_PASSWORD, MARIADB_ALLOW_EMPTY_ROOT_PASSWORD and MARIADB_RANDOM_ROOT_PASSWORD'
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# creates folders for the database
|
||||||
|
# also ensures permission for user mysql of run as root
|
||||||
|
docker_create_db_directories() {
|
||||||
|
local user; user="$(id -u)"
|
||||||
|
|
||||||
|
# TODO other directories that are used by default? like /var/lib/mysql-files
|
||||||
|
# see https://github.com/docker-library/mysql/issues/562
|
||||||
|
mkdir -p "$DATADIR"
|
||||||
|
|
||||||
|
if [ "$user" = "0" ]; then
|
||||||
|
# this will cause less disk access than `chown -R`
|
||||||
|
find "$DATADIR" \! -user mysql -exec chown mysql '{}' +
|
||||||
|
# See https://github.com/MariaDB/mariadb-docker/issues/363
|
||||||
|
find "${SOCKET%/*}" -maxdepth 0 \! -user mysql -exec chown mysql '{}' \;
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# initializes the database directory
|
||||||
|
docker_init_database_dir() {
|
||||||
|
mysql_note "Initializing database files"
|
||||||
|
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
|
||||||
|
if { mysql_install_db --help || :; } | grep -q -- '--skip-test-db'; then
|
||||||
|
# 10.3+
|
||||||
|
installArgs+=( --skip-test-db )
|
||||||
|
fi
|
||||||
|
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
|
||||||
|
mysql_install_db "${installArgs[@]}" "${@:2}" --default-time-zone=SYSTEM --enforce-storage-engine=
|
||||||
|
mysql_note "Database files initialized"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Loads various settings that are used elsewhere in the script
|
||||||
|
# This should be called after mysql_check_config, but before any other functions
|
||||||
|
docker_setup_env() {
|
||||||
|
# Get config
|
||||||
|
declare -g DATADIR SOCKET
|
||||||
|
DATADIR="$(mysql_get_config 'datadir' "$@")"
|
||||||
|
SOCKET="$(mysql_get_config 'socket' "$@")"
|
||||||
|
|
||||||
|
|
||||||
|
# Initialize values that might be stored in a file
|
||||||
|
_mariadb_file_env 'MYSQL_ROOT_HOST' '%'
|
||||||
|
_mariadb_file_env 'MYSQL_DATABASE'
|
||||||
|
_mariadb_file_env 'MYSQL_USER'
|
||||||
|
_mariadb_file_env 'MYSQL_PASSWORD'
|
||||||
|
_mariadb_file_env 'MYSQL_ROOT_PASSWORD'
|
||||||
|
|
||||||
|
# set MARIADB_ from MYSQL_ when it is unset and then make them the same value
|
||||||
|
: "${MARIADB_ALLOW_EMPTY_ROOT_PASSWORD:=${MYSQL_ALLOW_EMPTY_PASSWORD:-}}"
|
||||||
|
export MYSQL_ALLOW_EMPTY_PASSWORD="$MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" MARIADB_ALLOW_EMPTY_ROOT_PASSWORD
|
||||||
|
: "${MARIADB_RANDOM_ROOT_PASSWORD:=${MYSQL_RANDOM_ROOT_PASSWORD:-}}"
|
||||||
|
export MYSQL_RANDOM_ROOT_PASSWORD="$MARIADB_RANDOM_ROOT_PASSWORD" MARIADB_RANDOM_ROOT_PASSWORD
|
||||||
|
: "${MARIADB_INITDB_SKIP_TZINFO:=${MYSQL_INITDB_SKIP_TZINFO:-}}"
|
||||||
|
export MYSQL_INITDB_SKIP_TZINFO="$MARIADB_INITDB_SKIP_TZINFO" MARIADB_INITDB_SKIP_TZINFO
|
||||||
|
|
||||||
|
declare -g DATABASE_ALREADY_EXISTS
|
||||||
|
if [ -d "$DATADIR/mysql" ]; then
|
||||||
|
DATABASE_ALREADY_EXISTS='true'
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Execute the client, use via docker_process_sql to handle root password
|
||||||
|
docker_exec_client() {
|
||||||
|
# args sent in can override this db, since they will be later in the command
|
||||||
|
if [ -n "$MYSQL_DATABASE" ]; then
|
||||||
|
set -- --database="$MYSQL_DATABASE" "$@"
|
||||||
|
fi
|
||||||
|
mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Execute sql script, passed via stdin
|
||||||
|
# usage: docker_process_sql [--dont-use-mysql-root-password] [mysql-cli-args]
|
||||||
|
# ie: docker_process_sql --database=mydb <<<'INSERT ...'
|
||||||
|
# ie: docker_process_sql --dont-use-mysql-root-password --database=mydb <my-file.sql
|
||||||
|
docker_process_sql() {
|
||||||
|
passfileArgs=()
|
||||||
|
if [ '--dont-use-mysql-root-password' = "$1" ]; then
|
||||||
|
shift
|
||||||
|
MYSQL_PWD= docker_exec_client "$@"
|
||||||
|
else
|
||||||
|
MYSQL_PWD=$MARIADB_ROOT_PASSWORD docker_exec_client "$@"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# SQL escape the string $1 to be placed in a string literal.
|
||||||
|
# escape, \ followed by '
|
||||||
|
docker_sql_escape_string_literal() {
|
||||||
|
local newline=$'\n'
|
||||||
|
local escaped=${1//\\/\\\\}
|
||||||
|
escaped="${escaped//$newline/\\n}"
|
||||||
|
echo "${escaped//\'/\\\'}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Initializes database with timezone info and root password, plus optional extra db/user
|
||||||
|
docker_setup_db() {
|
||||||
|
# Load timezone info into database
|
||||||
|
if [ -z "$MARIADB_INITDB_SKIP_TZINFO" ]; then
|
||||||
|
{
|
||||||
|
# Aria in 10.4+ is slow due to "transactional" (crash safety)
|
||||||
|
# https://jira.mariadb.org/browse/MDEV-23326
|
||||||
|
# https://github.com/docker-library/mariadb/issues/262
|
||||||
|
local tztables=( time_zone time_zone_leap_second time_zone_name time_zone_transition time_zone_transition_type )
|
||||||
|
for table in "${tztables[@]}"; do
|
||||||
|
echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=0 */;"
|
||||||
|
done
|
||||||
|
|
||||||
|
# sed is for https://bugs.mysql.com/bug.php?id=20545
|
||||||
|
mariadb-tzinfo-to-sql /usr/share/zoneinfo \
|
||||||
|
| sed 's/Local time zone must be set--see zic manual page/FCTY/'
|
||||||
|
|
||||||
|
for table in "${tztables[@]}"; do
|
||||||
|
echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=1 */;"
|
||||||
|
done
|
||||||
|
} | docker_process_sql --dont-use-mysql-root-password --database=mysql
|
||||||
|
# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
|
||||||
|
fi
|
||||||
|
# Generate random root password
|
||||||
|
if [ -n "$MARIADB_RANDOM_ROOT_PASSWORD" ]; then
|
||||||
|
MARIADB_ROOT_PASSWORD="$(pwgen --numerals --capitalize --symbols --remove-chars="'\\" -1 32)"
|
||||||
|
export MARIADB_ROOT_PASSWORD MYSQL_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD
|
||||||
|
mysql_note "GENERATED ROOT PASSWORD: $MARIADB_ROOT_PASSWORD"
|
||||||
|
fi
|
||||||
|
# Sets root password and creates root users for non-localhost hosts
|
||||||
|
local rootCreate=
|
||||||
|
local rootPasswordEscaped
|
||||||
|
rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" )
|
||||||
|
|
||||||
|
# default root to listen for connections from anywhere
|
||||||
|
if [ -n "$MARIADB_ROOT_HOST" ] && [ "$MARIADB_ROOT_HOST" != 'localhost' ]; then
|
||||||
|
# no, we don't care if read finds a terminating character in this heredoc
|
||||||
|
# https://unix.stackexchange.com/questions/265149/why-is-set-o-errexit-breaking-this-read-heredoc-expression/265151#265151
|
||||||
|
read -r -d '' rootCreate <<-EOSQL || true
|
||||||
|
CREATE USER 'root'@'${MARIADB_ROOT_HOST}' IDENTIFIED BY '${rootPasswordEscaped}' ;
|
||||||
|
GRANT ALL ON *.* TO 'root'@'${MARIADB_ROOT_HOST}' WITH GRANT OPTION ;
|
||||||
|
EOSQL
|
||||||
|
fi
|
||||||
|
|
||||||
|
# tell docker_process_sql to not use MARIADB_ROOT_PASSWORD since it is just now being set
|
||||||
|
# --binary-mode to save us from the semi-mad users go out of their way to confuse the encoding.
|
||||||
|
docker_process_sql --dont-use-mysql-root-password --database=mysql --binary-mode <<-EOSQL
|
||||||
|
-- What's done in this file shouldn't be replicated
|
||||||
|
-- or products like mysql-fabric won't work
|
||||||
|
SET @@SESSION.SQL_LOG_BIN=0;
|
||||||
|
-- we need the SQL_MODE NO_BACKSLASH_ESCAPES mode to be clear for the password to be set
|
||||||
|
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
|
||||||
|
|
||||||
|
DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mariadb.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ;
|
||||||
|
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
|
||||||
|
-- 10.1: https://github.com/MariaDB/server/blob/d925aec1c10cebf6c34825a7de50afe4e630aff4/scripts/mysql_secure_installation.sh#L347-L365
|
||||||
|
-- 10.5: https://github.com/MariaDB/server/blob/00c3a28820c67c37ebbca72691f4897b57f2eed5/scripts/mysql_secure_installation.sh#L351-L369
|
||||||
|
DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%' ;
|
||||||
|
|
||||||
|
GRANT ALL ON *.* TO 'root'@'localhost' WITH GRANT OPTION ;
|
||||||
|
FLUSH PRIVILEGES ;
|
||||||
|
${rootCreate}
|
||||||
|
DROP DATABASE IF EXISTS test ;
|
||||||
|
EOSQL
|
||||||
|
|
||||||
|
# Creates a custom database and user if specified
|
||||||
|
if [ -n "$MARIADB_DATABASE" ]; then
|
||||||
|
mysql_note "Creating database ${MARIADB_DATABASE}"
|
||||||
|
docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#modifed
|
||||||
|
for dbName in "${hidcheDBList[@]}"; do
|
||||||
|
local fullDBName
|
||||||
|
local subPW
|
||||||
|
fullDBName="${HIDCHE_DB_PREFIX}_${dbName}"
|
||||||
|
mysql_note "Creating database ${fullDBName}"
|
||||||
|
subPW=`echo -n ${dbName}${HIDCHE_PW_SALT}${MARIADB_ROOT_PASSWORD}${dbName}${HIDCHE_PW_SALT} | shasum -a 512`
|
||||||
|
subPW=${subPW:0:32}
|
||||||
|
mysql_note "GENERATED ${fullDBName} PASSWORD: $subPW"
|
||||||
|
local userPasswordEscaped
|
||||||
|
userPasswordEscaped=$( docker_sql_escape_string_literal "${subPW}" )
|
||||||
|
|
||||||
|
docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$fullDBName\` ;"
|
||||||
|
docker_process_sql --database=mysql --binary-mode <<-EOSQL_SUBDB
|
||||||
|
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
|
||||||
|
CREATE USER '$fullDBName'@'%' IDENTIFIED BY '$userPasswordEscaped';
|
||||||
|
EOSQL_SUBDB
|
||||||
|
docker_process_sql --database=mysql <<<"GRANT ALL ON \`${fullDBName//_/\\_}\`.* TO '$fullDBName'@'%' ;"
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -n "$HIDCHE_DB_BBS_USER" ] && [ -n "$HIDCHE_DB_BBS_PASSWORD" ]; then
|
||||||
|
local fullBBS_DBName
|
||||||
|
fullBBS_DBName="${HIDCHE_DB_PREFIX}_board"
|
||||||
|
mysql_note "Creating database ${fullBBS_DBName}"
|
||||||
|
docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$fullBBS_DBName\` ;"
|
||||||
|
|
||||||
|
mysql_note "Creating user ${HIDCHE_DB_BBS_USER}"
|
||||||
|
# SQL escape the user password, \ followed by '
|
||||||
|
local userPasswordEscaped
|
||||||
|
userPasswordEscaped=$( docker_sql_escape_string_literal "${HIDCHE_DB_BBS_PASSWORD}" )
|
||||||
|
docker_process_sql --database=mysql --binary-mode <<-EOSQL_USER
|
||||||
|
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
|
||||||
|
CREATE USER '$HIDCHE_DB_BBS_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';
|
||||||
|
EOSQL_USER
|
||||||
|
docker_process_sql --database=mysql <<<"GRANT ALL ON \`${fullBBS_DBName//_/\\_}\`.* TO '$HIDCHE_DB_BBS_USER'@'%' ;"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# check arguments for an option that would cause mariadbd to stop
|
||||||
|
# return true if there is one
|
||||||
|
_mysql_want_help() {
|
||||||
|
local arg
|
||||||
|
for arg; do
|
||||||
|
case "$arg" in
|
||||||
|
-'?'|--help|--print-defaults|-V|--version)
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
_main() {
|
||||||
|
# if command starts with an option, prepend mysqld
|
||||||
|
if [ "${1:0:1}" = '-' ]; then
|
||||||
|
set -- mariadbd "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# skip setup if they aren't running mariadbd or want an option that stops mysqld
|
||||||
|
if [ "$1" = 'mariadbd' ] || [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then
|
||||||
|
mysql_note "Entrypoint script for MariaDB Server ${MARIADB_VERSION} started."
|
||||||
|
|
||||||
|
mysql_check_config "$@"
|
||||||
|
# Load various environment variables
|
||||||
|
docker_setup_env "$@"
|
||||||
|
docker_create_db_directories
|
||||||
|
|
||||||
|
# If container is started as root user, restart as dedicated mysql user
|
||||||
|
if [ "$(id -u)" = "0" ]; then
|
||||||
|
mysql_note "Switching to dedicated user 'mysql'"
|
||||||
|
exec gosu mysql "$BASH_SOURCE" "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# there's no database, so it needs to be initialized
|
||||||
|
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
|
||||||
|
docker_verify_minimum_env
|
||||||
|
|
||||||
|
# check dir permissions to reduce likelihood of half-initialized database
|
||||||
|
ls /docker-entrypoint-initdb.d/ > /dev/null
|
||||||
|
|
||||||
|
docker_init_database_dir "$@"
|
||||||
|
|
||||||
|
mysql_note "Starting temporary server"
|
||||||
|
docker_temp_server_start "$@"
|
||||||
|
mysql_note "Temporary server started."
|
||||||
|
|
||||||
|
docker_setup_db
|
||||||
|
docker_process_init_files /docker-entrypoint-initdb.d/*
|
||||||
|
|
||||||
|
mysql_note "Stopping temporary server"
|
||||||
|
docker_temp_server_stop
|
||||||
|
mysql_note "Temporary server stopped"
|
||||||
|
|
||||||
|
echo
|
||||||
|
mysql_note "MariaDB init process with HIDCHE done. Ready for start up."
|
||||||
|
echo
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
exec "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# If we are sourced from elsewhere, don't perform any further actions
|
||||||
|
if ! _is_sourced; then
|
||||||
|
_main "$@"
|
||||||
|
fi
|
||||||
@@ -1,222 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# from https://github.com/docker-library/mariadb/blob/master/10.4/Dockerfile
|
|
||||||
|
|
||||||
set -eo pipefail
|
|
||||||
shopt -s nullglob
|
|
||||||
|
|
||||||
|
|
||||||
# if command starts with an option, prepend mysqld
|
|
||||||
if [ "${1:0:1}" = '-' ]; then
|
|
||||||
set -- mysqld "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# skip setup if they want an option that stops mysqld
|
|
||||||
wantHelp=
|
|
||||||
for arg; do
|
|
||||||
case "$arg" in
|
|
||||||
-'?'|--help|--print-defaults|-V|--version)
|
|
||||||
wantHelp=1
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# usage: file_env VAR [DEFAULT]
|
|
||||||
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
|
|
||||||
# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
|
|
||||||
# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
|
|
||||||
file_env() {
|
|
||||||
local var="$1"
|
|
||||||
local fileVar="${var}_FILE"
|
|
||||||
local def="${2:-}"
|
|
||||||
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
|
||||||
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
local val="$def"
|
|
||||||
if [ "${!var:-}" ]; then
|
|
||||||
val="${!var}"
|
|
||||||
elif [ "${!fileVar:-}" ]; then
|
|
||||||
val="$(< "${!fileVar}")"
|
|
||||||
fi
|
|
||||||
export "$var"="$val"
|
|
||||||
unset "$fileVar"
|
|
||||||
}
|
|
||||||
|
|
||||||
_check_config() {
|
|
||||||
toRun=( "$@" --verbose --help --log-bin-index="$(mktemp -u)" )
|
|
||||||
if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
|
|
||||||
cat >&2 <<-EOM
|
|
||||||
ERROR: mysqld failed while attempting to check config
|
|
||||||
command was: "${toRun[*]}"
|
|
||||||
$errors
|
|
||||||
EOM
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#modifed
|
|
||||||
file_env 'TZ'
|
|
||||||
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
|
||||||
|
|
||||||
#modifed
|
|
||||||
hidcheDBList=("root" "che" "kwe" "pwe" "twe" "nya" "pya" "hwe")
|
|
||||||
|
|
||||||
# Fetch value from server config
|
|
||||||
# We use mysqld --verbose --help instead of my_print_defaults because the
|
|
||||||
# latter only show values present in config files, and not server defaults
|
|
||||||
_get_config() {
|
|
||||||
local conf="$1"; shift
|
|
||||||
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null \
|
|
||||||
| awk '$1 == "'"$conf"'" && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
|
|
||||||
# match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)"
|
|
||||||
}
|
|
||||||
|
|
||||||
# allow the container to be started with `--user`
|
|
||||||
if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
|
|
||||||
_check_config "$@"
|
|
||||||
DATADIR="$(_get_config 'datadir' "$@")"
|
|
||||||
mkdir -p "$DATADIR"
|
|
||||||
find "$DATADIR" \! -user mysql -exec chown mysql '{}' +
|
|
||||||
exec gosu mysql "$BASH_SOURCE" "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
|
|
||||||
# still need to check config, container may have started with --user
|
|
||||||
_check_config "$@"
|
|
||||||
# Get config
|
|
||||||
DATADIR="$(_get_config 'datadir' "$@")"
|
|
||||||
|
|
||||||
if [ ! -d "$DATADIR/mysql" ]; then
|
|
||||||
file_env 'MYSQL_ROOT_PASSWORD'
|
|
||||||
if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
|
|
||||||
echo >&2 'error: database is uninitialized and password option is not specified '
|
|
||||||
echo >&2 ' You need to specify one of MYSQL_ROOT_PASSWORD, MYSQL_ALLOW_EMPTY_PASSWORD and MYSQL_RANDOM_ROOT_PASSWORD'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p "$DATADIR"
|
|
||||||
|
|
||||||
echo 'Initializing database'
|
|
||||||
installArgs=( --datadir="$DATADIR" --rpm )
|
|
||||||
if { mysql_install_db --help || :; } | grep -q -- '--auth-root-authentication-method'; then
|
|
||||||
# beginning in 10.4.3, install_db uses "socket" which only allows system user root to connect, switch back to "normal" to allow mysql root without a password
|
|
||||||
# see https://github.com/MariaDB/server/commit/b9f3f06857ac6f9105dc65caae19782f09b47fb3
|
|
||||||
# (this flag doesn't exist in 10.0 and below)
|
|
||||||
installArgs+=( --auth-root-authentication-method=normal )
|
|
||||||
fi
|
|
||||||
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
|
||||||
mysql_install_db "${installArgs[@]}" "${@:2}"
|
|
||||||
echo 'Database initialized'
|
|
||||||
|
|
||||||
SOCKET="$(_get_config 'socket' "$@")"
|
|
||||||
"$@" --skip-networking --socket="${SOCKET}" &
|
|
||||||
pid="$!"
|
|
||||||
|
|
||||||
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
|
|
||||||
|
|
||||||
for i in {30..0}; do
|
|
||||||
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo 'MySQL init process in progress...'
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
if [ "$i" = 0 ]; then
|
|
||||||
echo >&2 'MySQL init process failed.'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$MYSQL_INITDB_SKIP_TZINFO" ]; then
|
|
||||||
# sed is for https://bugs.mysql.com/bug.php?id=20545
|
|
||||||
mysql_tzinfo_to_sql /usr/share/zoneinfo | sed 's/Local time zone must be set--see zic manual page/FCTY/' | "${mysql[@]}" mysql
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
|
|
||||||
export MYSQL_ROOT_PASSWORD="$(pwgen -1 32)"
|
|
||||||
echo "GENERATED ROOT PASSWORD: $MYSQL_ROOT_PASSWORD"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rootCreate=
|
|
||||||
# default root to listen for connections from anywhere
|
|
||||||
file_env 'MYSQL_ROOT_HOST' '%'
|
|
||||||
if [ ! -z "$MYSQL_ROOT_HOST" -a "$MYSQL_ROOT_HOST" != 'localhost' ]; then
|
|
||||||
# no, we don't care if read finds a terminating character in this heredoc
|
|
||||||
# https://unix.stackexchange.com/questions/265149/why-is-set-o-errexit-breaking-this-read-heredoc-expression/265151#265151
|
|
||||||
read -r -d '' rootCreate <<-EOSQL || true
|
|
||||||
CREATE USER 'root'@'${MYSQL_ROOT_HOST}' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
|
|
||||||
GRANT ALL ON *.* TO 'root'@'${MYSQL_ROOT_HOST}' WITH GRANT OPTION ;
|
|
||||||
EOSQL
|
|
||||||
fi
|
|
||||||
|
|
||||||
"${mysql[@]}" <<-EOSQL
|
|
||||||
-- What's done in this file shouldn't be replicated
|
|
||||||
-- or products like mysql-fabric won't work
|
|
||||||
SET @@SESSION.SQL_LOG_BIN=0;
|
|
||||||
DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ;
|
|
||||||
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASSWORD}') ;
|
|
||||||
GRANT ALL ON *.* TO 'root'@'localhost' WITH GRANT OPTION ;
|
|
||||||
${rootCreate}
|
|
||||||
DROP DATABASE IF EXISTS test ;
|
|
||||||
FLUSH PRIVILEGES ;
|
|
||||||
EOSQL
|
|
||||||
|
|
||||||
if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
|
|
||||||
mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#modifed
|
|
||||||
file_env 'HIDCHE_DB_PREFIX'
|
|
||||||
if [ "$HIDCHE_DB_PREFIX" ]; then
|
|
||||||
for dbName in "${hidcheDBList[@]}"; do
|
|
||||||
fullDBName="${HIDCHE_DB_PREFIX}_${dbName}"
|
|
||||||
echo "CREATE DATABASE IF NOT EXISTS \`$fullDBName\` ;" | "${mysql[@]}"
|
|
||||||
done
|
|
||||||
mysql+=( "${HIDCHE_DB_PREFIX}_${hidcheDBList[0]}" )
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
file_env 'MYSQL_USER'
|
|
||||||
file_env 'MYSQL_PASSWORD'
|
|
||||||
if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
|
|
||||||
echo "CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;" | "${mysql[@]}"
|
|
||||||
|
|
||||||
#modifed
|
|
||||||
if [ "$HIDCHE_DB_PREFIX" ]; then
|
|
||||||
for dbName in "${hidcheDBList[@]}"; do
|
|
||||||
fullDBName="${HIDCHE_DB_PREFIX}_${dbName}"
|
|
||||||
subPW=`echo -n ${dbName}${MYSQL_USER}${MYSQL_PASSWORD}${dbName} | shasum -a 512`
|
|
||||||
subPW=${subPW:0:32}
|
|
||||||
echo "CREATE USER '$fullDBName'@'%' IDENTIFIED BY '$subPW' ;" | "${mysql[@]}"
|
|
||||||
echo "GRANT ALL ON \`$fullDBName\`.* TO '$MYSQL_USER'@'%' ;" | "${mysql[@]}"
|
|
||||||
echo "GRANT ALL ON \`$fullDBName\`.* TO '$fullDBName'@'%' ;" | "${mysql[@]}"
|
|
||||||
done
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo
|
|
||||||
for f in /docker-entrypoint-initdb.d/*; do
|
|
||||||
case "$f" in
|
|
||||||
*.sh) echo "$0: running $f"; . "$f" ;;
|
|
||||||
*.sql) echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;
|
|
||||||
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${mysql[@]}"; echo ;;
|
|
||||||
*) echo "$0: ignoring $f" ;;
|
|
||||||
esac
|
|
||||||
echo
|
|
||||||
done
|
|
||||||
|
|
||||||
if ! kill -s TERM "$pid" || ! wait "$pid"; then
|
|
||||||
echo >&2 'MySQL init process failed.'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo 'MySQL init process with HIDCHE done. Ready for start up.'
|
|
||||||
echo
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
|
||||||
@@ -13,10 +13,11 @@ services:
|
|||||||
web:
|
web:
|
||||||
build: ./web
|
build: ./web
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
#ports:
|
||||||
- 8080:80
|
# - 8080:80
|
||||||
volumes:
|
volumes:
|
||||||
- hidche:/var/www/html:ro
|
- hidche:/var/www/html:ro
|
||||||
|
- board:/var/www/board:ro
|
||||||
|
|
||||||
app:
|
app:
|
||||||
build: ./app
|
build: ./app
|
||||||
@@ -29,13 +30,22 @@ services:
|
|||||||
- db
|
- db
|
||||||
- web
|
- web
|
||||||
|
|
||||||
|
board:
|
||||||
|
build: ./board
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- board:/var/www/board
|
||||||
|
env_file:
|
||||||
|
- game.env
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
- web
|
||||||
|
|
||||||
install:
|
install:
|
||||||
build: ./install
|
build: ./install
|
||||||
restart: "no"
|
restart: "no"
|
||||||
volumes:
|
volumes:
|
||||||
- hidche:/var/www/html
|
- hidche:/var/www/html
|
||||||
environment:
|
|
||||||
- MYSQL_HOST=db
|
|
||||||
env_file:
|
env_file:
|
||||||
- account.env
|
- account.env
|
||||||
- game.env
|
- game.env
|
||||||
@@ -44,6 +54,23 @@ services:
|
|||||||
- db
|
- db
|
||||||
- web
|
- web
|
||||||
|
|
||||||
|
backup:
|
||||||
|
build: ./backup
|
||||||
|
restart: "no"
|
||||||
|
#restart: always
|
||||||
|
command:
|
||||||
|
- echo 'backup is disabled'
|
||||||
|
#- crond -f -L /dev/stdout
|
||||||
|
volumes:
|
||||||
|
- hidche:/var/www/html:ro
|
||||||
|
- backup:/var/backup
|
||||||
|
env_file:
|
||||||
|
- account.env
|
||||||
|
- game.env
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
- db
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
build: ./cron
|
build: ./cron
|
||||||
restart: always
|
restart: always
|
||||||
@@ -55,3 +82,5 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
db:
|
db:
|
||||||
hidche:
|
hidche:
|
||||||
|
board:
|
||||||
|
backup:
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
version: '3.2'
|
||||||
|
|
||||||
|
services:
|
||||||
|
db:
|
||||||
|
ports:
|
||||||
|
- 3306:3306
|
||||||
|
#For DEV. Expose MySQL port
|
||||||
|
volumes:
|
||||||
|
- type: bind
|
||||||
|
source: ~/dev_sam/db
|
||||||
|
target: /var/lib/mysql
|
||||||
|
|
||||||
|
web:
|
||||||
|
build:
|
||||||
|
args:
|
||||||
|
UID: 1000
|
||||||
|
GID: 1000
|
||||||
|
#For DEV. Set UID of www-data as first local user
|
||||||
|
ports:
|
||||||
|
- 8084:80
|
||||||
|
#For DEV. Export Web port.
|
||||||
|
volumes:
|
||||||
|
- type: bind
|
||||||
|
source: ~/dev_sam/app
|
||||||
|
target: /var/www/html
|
||||||
|
#For DEV. Set app path as local directory
|
||||||
|
- type: bind
|
||||||
|
source: ~/dev_sam/board
|
||||||
|
target: /var/www/board
|
||||||
|
|
||||||
|
app:
|
||||||
|
build:
|
||||||
|
args:
|
||||||
|
UID: 1000
|
||||||
|
GID: 1000
|
||||||
|
volumes:
|
||||||
|
- type: bind
|
||||||
|
source: ~/dev_sam/app
|
||||||
|
target: /var/www/html
|
||||||
|
|
||||||
|
board:
|
||||||
|
build:
|
||||||
|
args:
|
||||||
|
UID: 1000
|
||||||
|
GID: 1000
|
||||||
|
volumes:
|
||||||
|
- type: bind
|
||||||
|
source: ~/dev_sam/board
|
||||||
|
target: /var/www/board
|
||||||
|
|
||||||
|
install:
|
||||||
|
volumes:
|
||||||
|
- type: bind
|
||||||
|
source: ~/dev_sam/app
|
||||||
|
target: /var/www/html
|
||||||
|
|
||||||
|
cron:
|
||||||
|
build: ./cron
|
||||||
|
restart: "no"
|
||||||
|
#For DEV. Disable cron
|
||||||
|
entrypoint: ["echo", "Service cron disabled"]
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- type: bind
|
||||||
|
source: ~/dev_sam/app
|
||||||
|
target: /var/www/html
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
|
||||||
|
backup:
|
||||||
|
restart: "no"
|
||||||
|
entrypoint: ["echo", "backup is disabled"]
|
||||||
|
volumes:
|
||||||
|
- type: bind
|
||||||
|
source: ~/dev_sam/backup
|
||||||
|
target: /var/backup
|
||||||
|
- type: bind
|
||||||
|
read_only: true
|
||||||
|
source: ~/dev_sam/app
|
||||||
|
target: /var/www/html
|
||||||
|
- type: bind
|
||||||
|
read_only: true
|
||||||
|
source: ~/dev_sam/board
|
||||||
|
target: /var/www/board
|
||||||
@@ -2,10 +2,12 @@
|
|||||||
#서버 git 주소.
|
#서버 git 주소.
|
||||||
#만약 https:// 대신 ssh://로 시작하는 주소를 사용하는 경우 app/id_ecdsa, app/known_host 에 ecdsa 개인키와 ssh값을 추가할 것.
|
#만약 https:// 대신 ssh://로 시작하는 주소를 사용하는 경우 app/id_ecdsa, app/known_host 에 ecdsa 개인키와 ssh값을 추가할 것.
|
||||||
gameGitPath=ssh://git@storage.hided.net:2525/devsam/core.git
|
gameGitPath=ssh://git@storage.hided.net:2525/devsam/core.git
|
||||||
|
gameGitBranch=devel
|
||||||
imgGitPath=ssh://git@storage.hided.net:2525/devsam/image.git
|
imgGitPath=ssh://git@storage.hided.net:2525/devsam/image.git
|
||||||
|
|
||||||
#게임 시간대.
|
#게임 시간대.
|
||||||
TZ=Asia/Seoul
|
TZ=Asia/Seoul
|
||||||
|
LC_ALL=C.UTF-8
|
||||||
|
|
||||||
#서버 리스트. 구현 문제로 아래 서버들로 현재 고정. Dockercompose 값 수정 불가.
|
#서버 리스트. 구현 문제로 아래 서버들로 현재 고정. Dockercompose 값 수정 불가.
|
||||||
HIDCHE_SERVER_LIST=che,kwe,pwe,twe,nya,pya,hwe
|
HIDCHE_SERVER_LIST=che,kwe,pwe,twe,nya,pya,hwe
|
||||||
@@ -17,3 +19,6 @@ HIDCHE_GAME_PATH=http://127.0.0.1:8080/sam
|
|||||||
HIDCHE_IMAGE_USE_INTERNAL=yes
|
HIDCHE_IMAGE_USE_INTERNAL=yes
|
||||||
#이미지 경로, HIDCHE_IMAGE_USE_INTERNAL이 yes인 경우 HIDCHE_GAME_PATH의 상대 경로. yes가 아닌 경우 전체 도메인 경로.
|
#이미지 경로, HIDCHE_IMAGE_USE_INTERNAL이 yes인 경우 HIDCHE_GAME_PATH의 상대 경로. yes가 아닌 경우 전체 도메인 경로.
|
||||||
HIDCHE_IMAGE_PATH=../image
|
HIDCHE_IMAGE_PATH=../image
|
||||||
|
|
||||||
|
#게시판 서버내 파일 백업 경로, /var/www/board/files 가 아니라면 직접 지정
|
||||||
|
#HIDCHE_BOARD_FILES_PATH=
|
||||||
@@ -20,6 +20,10 @@ indexPHP = '%s/index.php'%wwwRoot
|
|||||||
if os.path.exists('%s/hwe/d_setting/DB.php'):
|
if os.path.exists('%s/hwe/d_setting/DB.php'):
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
"X-Requested-With": "XMLHttpRequest",
|
||||||
|
}
|
||||||
|
|
||||||
useWaitIndex = False
|
useWaitIndex = False
|
||||||
if not os.path.exists(indexPHP):
|
if not os.path.exists(indexPHP):
|
||||||
useWaitIndex = True
|
useWaitIndex = True
|
||||||
@@ -41,13 +45,17 @@ if not os.path.exists(indexPHP):
|
|||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
r = requests.head('http://web/sam/f_install/j_install_status.php')
|
r = requests.head('http://web/sam/f_install/j_install_status.php')
|
||||||
if r.status_code == 200:
|
if r.status_code == 503 or r.status_code == 500:
|
||||||
|
b = requests.get('http://web/sam/install.php', timeout=60000)
|
||||||
|
elif r.status_code == 200:
|
||||||
break
|
break
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
print("Waiting for web connection...", flush=True)
|
print("Waiting for web connection...", flush=True)
|
||||||
time.sleep(2)
|
time.sleep(2)
|
||||||
|
|
||||||
|
requests.get('http://web/sam/install.php', timeout=60000) #NPM
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
result = subprocess.call('nc -z -v -w30 db 3306'.split(' '), stderr=subprocess.STDOUT)
|
result = subprocess.call('nc -z -v -w30 db 3306'.split(' '), stderr=subprocess.STDOUT)
|
||||||
if result == 0:
|
if result == 0:
|
||||||
@@ -57,9 +65,10 @@ while True:
|
|||||||
|
|
||||||
session = requests.session()
|
session = requests.session()
|
||||||
|
|
||||||
db_root_pw = hash_password('root', env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
|
db_root_pw = hash_password('root'+env['HIDCHE_PW_SALT'], env['MARIADB_ROOT_PASSWORD'])[:32]
|
||||||
db_root_name = '%s_root'%env['HIDCHE_DB_PREFIX']
|
db_root_name = '%s_root'%env['HIDCHE_DB_PREFIX']
|
||||||
|
|
||||||
|
print("Setup DB...", flush=True)
|
||||||
setupDBResult = session.post('http://web/sam/f_install/j_setup_db.php', {
|
setupDBResult = session.post('http://web/sam/f_install/j_setup_db.php', {
|
||||||
'db_host':'db',
|
'db_host':'db',
|
||||||
'db_port':3306,
|
'db_port':3306,
|
||||||
@@ -71,9 +80,11 @@ setupDBResult = session.post('http://web/sam/f_install/j_setup_db.php', {
|
|||||||
'game_image_path':'%s/game'%env['HIDCHE_IMAGE_PATH'],
|
'game_image_path':'%s/game'%env['HIDCHE_IMAGE_PATH'],
|
||||||
'kakao_rest_key':env['HIDCHE_KAKAO_REST_KEY'],
|
'kakao_rest_key':env['HIDCHE_KAKAO_REST_KEY'],
|
||||||
'kakao_admin_key':env['HIDCHE_KAKAO_ADMIN_KEY'],
|
'kakao_admin_key':env['HIDCHE_KAKAO_ADMIN_KEY'],
|
||||||
})
|
}, headers=headers)
|
||||||
|
if not setupDBResult.ok:
|
||||||
|
print(setupDBResult, flush=True)
|
||||||
setupDBJsonResult = json.loads(setupDBResult.text)
|
setupDBJsonResult = json.loads(setupDBResult.text)
|
||||||
print(setupDBJsonResult)
|
print(setupDBJsonResult, flush=True)
|
||||||
|
|
||||||
globalSalt = setupDBJsonResult['globalSalt']
|
globalSalt = setupDBJsonResult['globalSalt']
|
||||||
|
|
||||||
@@ -84,23 +95,26 @@ query = {
|
|||||||
'password':hashPassword,
|
'password':hashPassword,
|
||||||
'nickname':'운영자'
|
'nickname':'운영자'
|
||||||
}
|
}
|
||||||
setupAdminResult = session.post('http://web/sam/f_install/j_create_admin.php', query)
|
|
||||||
setupAdminJsonResult = json.loads(setupAdminResult.text)
|
|
||||||
print(setupAdminJsonResult)
|
|
||||||
|
|
||||||
loginResult = session.post('http://web/sam/j_login.php', query)
|
print("Create Admin...", flush=True)
|
||||||
print(loginResult.text)
|
setupAdminResult = session.post('http://web/sam/f_install/j_create_admin.php', query, headers=headers)
|
||||||
|
setupAdminJsonResult = json.loads(setupAdminResult.text)
|
||||||
|
print(setupAdminJsonResult, flush=True)
|
||||||
|
|
||||||
|
print("Login Admin...", flush=True)
|
||||||
|
loginResult = session.post('http://web/sam/api.php?path=Login%2FLoginByID', json=query, headers=headers)
|
||||||
|
print(loginResult.text, flush=True)
|
||||||
|
|
||||||
serverList = str(env['HIDCHE_SERVER_LIST']).split(',')
|
serverList = str(env['HIDCHE_SERVER_LIST']).split(',')
|
||||||
serverList.reverse()
|
serverList.reverse()
|
||||||
for serverName in serverList:
|
for serverName in serverList:
|
||||||
updateResult = session.post('http://web/sam/j_updateServer.php', {
|
updateResult = session.post('http://web/sam/j_updateServer.php', {
|
||||||
'server':serverName,
|
'server':serverName,
|
||||||
'target':'origin/devel'
|
'target':'origin/'+env['gameGitBranch']
|
||||||
})
|
}, headers=headers, timeout=60000)
|
||||||
print(serverName, updateResult.text)
|
print(serverName, updateResult.text, flush=True)
|
||||||
|
|
||||||
db_pw = hash_password(serverName, env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
|
db_pw = hash_password(serverName+env['HIDCHE_PW_SALT'], env['MARIADB_ROOT_PASSWORD'])[:32]
|
||||||
db_name = '%s_%s'%(env['HIDCHE_DB_PREFIX'], serverName)
|
db_name = '%s_%s'%(env['HIDCHE_DB_PREFIX'], serverName)
|
||||||
resetResult = session.post('http://web/sam/%s/j_install_db.php'%serverName, {
|
resetResult = session.post('http://web/sam/%s/j_install_db.php'%serverName, {
|
||||||
'db_host':'db',
|
'db_host':'db',
|
||||||
@@ -108,13 +122,13 @@ for serverName in serverList:
|
|||||||
'db_id':db_name,
|
'db_id':db_name,
|
||||||
'db_pw':db_pw,
|
'db_pw':db_pw,
|
||||||
'db_name':db_name,
|
'db_name':db_name,
|
||||||
})
|
}, headers=headers)
|
||||||
print(serverName, resetResult.text)
|
print(serverName, resetResult.text, flush=True)
|
||||||
|
|
||||||
if useWaitIndex:
|
if useWaitIndex:
|
||||||
fp = open(indexPHP, 'wt', encoding='utf-8')
|
fp = open(indexPHP, 'wt', encoding='utf-8')
|
||||||
fp.write("<?php header('location:sam',TRUE,301);")
|
fp.write("<?php header('location:sam/',TRUE,301);")
|
||||||
fp.close()
|
fp.close()
|
||||||
os.chown(indexPHP, 33, 33)
|
os.chown(indexPHP, 33, 33)
|
||||||
|
|
||||||
print('Welcome to HIDCHE')
|
print('Welcome to HIDCHE', flush=True)
|
||||||
|
|||||||
+17
-3
@@ -1,8 +1,22 @@
|
|||||||
FROM httpd
|
FROM nginx:alpine
|
||||||
#debian
|
#debian
|
||||||
|
|
||||||
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
|
ARG UID=33
|
||||||
RUN mkdir -p /var/www/html
|
ARG GID=33
|
||||||
|
|
||||||
|
RUN if [ "$UID" != 33 ]; then \
|
||||||
|
apk add shadow; \
|
||||||
|
usermod -u $UID -o nginx; \
|
||||||
|
fi; \
|
||||||
|
if [ "$GID" != 33 ]; then \
|
||||||
|
apk add shadow; \
|
||||||
|
groupmod -g $GID -o nginx; \
|
||||||
|
fi;
|
||||||
|
|
||||||
|
COPY ./default.conf /etc/nginx/conf.d/default.conf
|
||||||
|
COPY ./sam.conf /etc/nginx/snippets/sam.conf
|
||||||
|
COPY ./rhymix.conf /etc/nginx/snippets/rhymix.conf
|
||||||
|
|
||||||
VOLUME /var/www/html
|
VOLUME /var/www/html
|
||||||
|
VOLUME /var/www/board
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name localhost;
|
||||||
|
|
||||||
|
root /var/www/html;
|
||||||
|
index index.php index.html index.htm;
|
||||||
|
|
||||||
|
#charset koi8-r;
|
||||||
|
#access_log /var/log/nginx/host.access.log main;
|
||||||
|
|
||||||
|
#error_page 404 /404.html;
|
||||||
|
|
||||||
|
# redirect server error pages to the static page /50x.html
|
||||||
|
#
|
||||||
|
error_page 500 502 503 504 /50x.html;
|
||||||
|
location = /50x.html {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /board {
|
||||||
|
root /var/www;
|
||||||
|
include snippets/rhymix.conf;
|
||||||
|
location ~ \.php$ {
|
||||||
|
include fastcgi_params;
|
||||||
|
fastcgi_pass board:9000;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
fastcgi_param REMOTE_ADDR $http_x_real_ip;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
include snippets/sam.conf;
|
||||||
|
location ~ \.php$ {
|
||||||
|
include fastcgi_params;
|
||||||
|
proxy_read_timeout 600;
|
||||||
|
fastcgi_pass app:9000;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
fastcgi_param REMOTE_ADDR $http_x_real_ip;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# deny access to .htaccess files, if Apache's document root
|
||||||
|
# concurs with nginx's one
|
||||||
|
#
|
||||||
|
location ~ /\.ht {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,583 +0,0 @@
|
|||||||
#
|
|
||||||
# This is the main Apache HTTP server configuration file. It contains the
|
|
||||||
# configuration directives that give the server its instructions.
|
|
||||||
# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
|
|
||||||
# In particular, see
|
|
||||||
# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
|
|
||||||
# for a discussion of each configuration directive.
|
|
||||||
#
|
|
||||||
# Do NOT simply read the instructions in here without understanding
|
|
||||||
# what they do. They're here only as hints or reminders. If you are unsure
|
|
||||||
# consult the online docs. You have been warned.
|
|
||||||
#
|
|
||||||
# Configuration and logfile names: If the filenames you specify for many
|
|
||||||
# of the server's control files begin with "/" (or "drive:/" for Win32), the
|
|
||||||
# server will use that explicit path. If the filenames do *not* begin
|
|
||||||
# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
|
|
||||||
# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
|
|
||||||
# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
|
|
||||||
# will be interpreted as '/logs/access_log'.
|
|
||||||
|
|
||||||
#
|
|
||||||
# ServerRoot: The top of the directory tree under which the server's
|
|
||||||
# configuration, error, and log files are kept.
|
|
||||||
#
|
|
||||||
# Do not add a slash at the end of the directory path. If you point
|
|
||||||
# ServerRoot at a non-local disk, be sure to specify a local disk on the
|
|
||||||
# Mutex directive, if file-based mutexes are used. If you wish to share the
|
|
||||||
# same ServerRoot for multiple httpd daemons, you will need to change at
|
|
||||||
# least PidFile.
|
|
||||||
#
|
|
||||||
ServerRoot "/usr/local/apache2"
|
|
||||||
|
|
||||||
#
|
|
||||||
# Mutex: Allows you to set the mutex mechanism and mutex file directory
|
|
||||||
# for individual mutexes, or change the global defaults
|
|
||||||
#
|
|
||||||
# Uncomment and change the directory if mutexes are file-based and the default
|
|
||||||
# mutex file directory is not on a local disk or is not appropriate for some
|
|
||||||
# other reason.
|
|
||||||
#
|
|
||||||
# Mutex default:logs
|
|
||||||
|
|
||||||
#
|
|
||||||
# Listen: Allows you to bind Apache to specific IP addresses and/or
|
|
||||||
# ports, instead of the default. See also the <VirtualHost>
|
|
||||||
# directive.
|
|
||||||
#
|
|
||||||
# Change this to Listen on specific IP addresses as shown below to
|
|
||||||
# prevent Apache from glomming onto all bound IP addresses.
|
|
||||||
#
|
|
||||||
#Listen 12.34.56.78:80
|
|
||||||
Listen 80
|
|
||||||
|
|
||||||
#
|
|
||||||
# Dynamic Shared Object (DSO) Support
|
|
||||||
#
|
|
||||||
# To be able to use the functionality of a module which was built as a DSO you
|
|
||||||
# have to place corresponding `LoadModule' lines at this location so the
|
|
||||||
# directives contained in it are actually available _before_ they are used.
|
|
||||||
# Statically compiled modules (those listed by `httpd -l') do not need
|
|
||||||
# to be loaded here.
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
# LoadModule foo_module modules/mod_foo.so
|
|
||||||
#
|
|
||||||
LoadModule mpm_event_module modules/mod_mpm_event.so
|
|
||||||
#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
|
|
||||||
#LoadModule mpm_worker_module modules/mod_mpm_worker.so
|
|
||||||
LoadModule authn_file_module modules/mod_authn_file.so
|
|
||||||
#LoadModule authn_dbm_module modules/mod_authn_dbm.so
|
|
||||||
#LoadModule authn_anon_module modules/mod_authn_anon.so
|
|
||||||
#LoadModule authn_dbd_module modules/mod_authn_dbd.so
|
|
||||||
#LoadModule authn_socache_module modules/mod_authn_socache.so
|
|
||||||
LoadModule authn_core_module modules/mod_authn_core.so
|
|
||||||
LoadModule authz_host_module modules/mod_authz_host.so
|
|
||||||
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
|
|
||||||
LoadModule authz_user_module modules/mod_authz_user.so
|
|
||||||
#LoadModule authz_dbm_module modules/mod_authz_dbm.so
|
|
||||||
#LoadModule authz_owner_module modules/mod_authz_owner.so
|
|
||||||
#LoadModule authz_dbd_module modules/mod_authz_dbd.so
|
|
||||||
LoadModule authz_core_module modules/mod_authz_core.so
|
|
||||||
#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
|
|
||||||
#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
|
|
||||||
LoadModule access_compat_module modules/mod_access_compat.so
|
|
||||||
LoadModule auth_basic_module modules/mod_auth_basic.so
|
|
||||||
#LoadModule auth_form_module modules/mod_auth_form.so
|
|
||||||
#LoadModule auth_digest_module modules/mod_auth_digest.so
|
|
||||||
#LoadModule allowmethods_module modules/mod_allowmethods.so
|
|
||||||
#LoadModule isapi_module modules/mod_isapi.so
|
|
||||||
#LoadModule file_cache_module modules/mod_file_cache.so
|
|
||||||
#LoadModule cache_module modules/mod_cache.so
|
|
||||||
#LoadModule cache_disk_module modules/mod_cache_disk.so
|
|
||||||
#LoadModule cache_socache_module modules/mod_cache_socache.so
|
|
||||||
#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
|
|
||||||
#LoadModule socache_dbm_module modules/mod_socache_dbm.so
|
|
||||||
#LoadModule socache_memcache_module modules/mod_socache_memcache.so
|
|
||||||
#LoadModule socache_redis_module modules/mod_socache_redis.so
|
|
||||||
#LoadModule watchdog_module modules/mod_watchdog.so
|
|
||||||
#LoadModule macro_module modules/mod_macro.so
|
|
||||||
#LoadModule dbd_module modules/mod_dbd.so
|
|
||||||
#LoadModule bucketeer_module modules/mod_bucketeer.so
|
|
||||||
#LoadModule dumpio_module modules/mod_dumpio.so
|
|
||||||
#LoadModule echo_module modules/mod_echo.so
|
|
||||||
#LoadModule example_hooks_module modules/mod_example_hooks.so
|
|
||||||
#LoadModule case_filter_module modules/mod_case_filter.so
|
|
||||||
#LoadModule case_filter_in_module modules/mod_case_filter_in.so
|
|
||||||
#LoadModule example_ipc_module modules/mod_example_ipc.so
|
|
||||||
#LoadModule buffer_module modules/mod_buffer.so
|
|
||||||
#LoadModule data_module modules/mod_data.so
|
|
||||||
#LoadModule ratelimit_module modules/mod_ratelimit.so
|
|
||||||
LoadModule reqtimeout_module modules/mod_reqtimeout.so
|
|
||||||
#LoadModule ext_filter_module modules/mod_ext_filter.so
|
|
||||||
#LoadModule request_module modules/mod_request.so
|
|
||||||
#LoadModule include_module modules/mod_include.so
|
|
||||||
LoadModule filter_module modules/mod_filter.so
|
|
||||||
#LoadModule reflector_module modules/mod_reflector.so
|
|
||||||
#LoadModule substitute_module modules/mod_substitute.so
|
|
||||||
#LoadModule sed_module modules/mod_sed.so
|
|
||||||
#LoadModule charset_lite_module modules/mod_charset_lite.so
|
|
||||||
LoadModule deflate_module modules/mod_deflate.so
|
|
||||||
#LoadModule xml2enc_module modules/mod_xml2enc.so
|
|
||||||
#LoadModule proxy_html_module modules/mod_proxy_html.so
|
|
||||||
#LoadModule brotli_module modules/mod_brotli.so
|
|
||||||
LoadModule mime_module modules/mod_mime.so
|
|
||||||
#LoadModule ldap_module modules/mod_ldap.so
|
|
||||||
LoadModule log_config_module modules/mod_log_config.so
|
|
||||||
#LoadModule log_debug_module modules/mod_log_debug.so
|
|
||||||
#LoadModule log_forensic_module modules/mod_log_forensic.so
|
|
||||||
#LoadModule logio_module modules/mod_logio.so
|
|
||||||
#LoadModule lua_module modules/mod_lua.so
|
|
||||||
LoadModule env_module modules/mod_env.so
|
|
||||||
LoadModule mime_magic_module modules/mod_mime_magic.so
|
|
||||||
#LoadModule cern_meta_module modules/mod_cern_meta.so
|
|
||||||
#LoadModule expires_module modules/mod_expires.so
|
|
||||||
LoadModule headers_module modules/mod_headers.so
|
|
||||||
#LoadModule ident_module modules/mod_ident.so
|
|
||||||
#LoadModule usertrack_module modules/mod_usertrack.so
|
|
||||||
#LoadModule unique_id_module modules/mod_unique_id.so
|
|
||||||
LoadModule setenvif_module modules/mod_setenvif.so
|
|
||||||
LoadModule version_module modules/mod_version.so
|
|
||||||
#LoadModule remoteip_module modules/mod_remoteip.so
|
|
||||||
LoadModule proxy_module modules/mod_proxy.so
|
|
||||||
#LoadModule proxy_connect_module modules/mod_proxy_connect.so
|
|
||||||
#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
|
|
||||||
#LoadModule proxy_http_module modules/mod_proxy_http.so
|
|
||||||
LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
|
|
||||||
#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
|
|
||||||
#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
|
|
||||||
#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
|
|
||||||
#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
|
|
||||||
#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
|
|
||||||
#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
|
|
||||||
#LoadModule proxy_express_module modules/mod_proxy_express.so
|
|
||||||
#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
|
|
||||||
LoadModule session_module modules/mod_session.so
|
|
||||||
LoadModule session_cookie_module modules/mod_session_cookie.so
|
|
||||||
#LoadModule session_crypto_module modules/mod_session_crypto.so
|
|
||||||
#LoadModule session_dbd_module modules/mod_session_dbd.so
|
|
||||||
#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
|
|
||||||
#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
|
|
||||||
#LoadModule ssl_module modules/mod_ssl.so
|
|
||||||
#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
|
|
||||||
#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
|
|
||||||
#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
|
|
||||||
#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
|
|
||||||
#LoadModule dialup_module modules/mod_dialup.so
|
|
||||||
LoadModule http2_module modules/mod_http2.so
|
|
||||||
#LoadModule proxy_http2_module modules/mod_proxy_http2.so
|
|
||||||
#LoadModule md_module modules/mod_md.so
|
|
||||||
#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
|
|
||||||
#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
|
|
||||||
#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
|
|
||||||
#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
|
|
||||||
LoadModule unixd_module modules/mod_unixd.so
|
|
||||||
#LoadModule heartbeat_module modules/mod_heartbeat.so
|
|
||||||
#LoadModule heartmonitor_module modules/mod_heartmonitor.so
|
|
||||||
#LoadModule dav_module modules/mod_dav.so
|
|
||||||
LoadModule status_module modules/mod_status.so
|
|
||||||
LoadModule autoindex_module modules/mod_autoindex.so
|
|
||||||
#LoadModule asis_module modules/mod_asis.so
|
|
||||||
#LoadModule info_module modules/mod_info.so
|
|
||||||
#LoadModule suexec_module modules/mod_suexec.so
|
|
||||||
<IfModule !mpm_prefork_module>
|
|
||||||
#LoadModule cgid_module modules/mod_cgid.so
|
|
||||||
</IfModule>
|
|
||||||
<IfModule mpm_prefork_module>
|
|
||||||
#LoadModule cgi_module modules/mod_cgi.so
|
|
||||||
</IfModule>
|
|
||||||
#LoadModule dav_fs_module modules/mod_dav_fs.so
|
|
||||||
#LoadModule dav_lock_module modules/mod_dav_lock.so
|
|
||||||
#LoadModule vhost_alias_module modules/mod_vhost_alias.so
|
|
||||||
#LoadModule negotiation_module modules/mod_negotiation.so
|
|
||||||
LoadModule dir_module modules/mod_dir.so
|
|
||||||
#LoadModule imagemap_module modules/mod_imagemap.so
|
|
||||||
#LoadModule actions_module modules/mod_actions.so
|
|
||||||
#LoadModule speling_module modules/mod_speling.so
|
|
||||||
#LoadModule userdir_module modules/mod_userdir.so
|
|
||||||
LoadModule alias_module modules/mod_alias.so
|
|
||||||
LoadModule rewrite_module modules/mod_rewrite.so
|
|
||||||
|
|
||||||
<IfModule unixd_module>
|
|
||||||
#
|
|
||||||
# If you wish httpd to run as a different user or group, you must run
|
|
||||||
# httpd as root initially and it will switch.
|
|
||||||
#
|
|
||||||
# User/Group: The name (or #number) of the user/group to run httpd as.
|
|
||||||
# It is usually good practice to create a dedicated user and group for
|
|
||||||
# running httpd, as with most system services.
|
|
||||||
#
|
|
||||||
User www-data
|
|
||||||
Group www-data
|
|
||||||
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# 'Main' server configuration
|
|
||||||
#
|
|
||||||
# The directives in this section set up the values used by the 'main'
|
|
||||||
# server, which responds to any requests that aren't handled by a
|
|
||||||
# <VirtualHost> definition. These values also provide defaults for
|
|
||||||
# any <VirtualHost> containers you may define later in the file.
|
|
||||||
#
|
|
||||||
# All of these directives may appear inside <VirtualHost> containers,
|
|
||||||
# in which case these default settings will be overridden for the
|
|
||||||
# virtual host being defined.
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# ServerAdmin: Your address, where problems with the server should be
|
|
||||||
# e-mailed. This address appears on some server-generated pages, such
|
|
||||||
# as error documents. e.g. admin@your-domain.com
|
|
||||||
#
|
|
||||||
ServerAdmin you@example.com
|
|
||||||
|
|
||||||
#
|
|
||||||
# ServerName gives the name and port that the server uses to identify itself.
|
|
||||||
# This can often be determined automatically, but we recommend you specify
|
|
||||||
# it explicitly to prevent problems during startup.
|
|
||||||
#
|
|
||||||
# If your host doesn't have a registered DNS name, enter its IP address here.
|
|
||||||
#
|
|
||||||
#ServerName www.example.com:80
|
|
||||||
|
|
||||||
#
|
|
||||||
# Deny access to the entirety of your server's filesystem. You must
|
|
||||||
# explicitly permit access to web content directories in other
|
|
||||||
# <Directory> blocks below.
|
|
||||||
#
|
|
||||||
<Directory />
|
|
||||||
AllowOverride none
|
|
||||||
Require all denied
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
#
|
|
||||||
# Note that from this point forward you must specifically allow
|
|
||||||
# particular features to be enabled - so if something's not working as
|
|
||||||
# you might expect, make sure that you have specifically enabled it
|
|
||||||
# below.
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# DocumentRoot: The directory out of which you will serve your
|
|
||||||
# documents. By default, all requests are taken from this directory, but
|
|
||||||
# symbolic links and aliases may be used to point to other locations.
|
|
||||||
#
|
|
||||||
DocumentRoot "/var/www/html"
|
|
||||||
<Directory "/var/www/html">
|
|
||||||
#
|
|
||||||
# Possible values for the Options directive are "None", "All",
|
|
||||||
# or any combination of:
|
|
||||||
# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
|
|
||||||
#
|
|
||||||
# Note that "MultiViews" must be named *explicitly* --- "Options All"
|
|
||||||
# doesn't give it to you.
|
|
||||||
#
|
|
||||||
# The Options directive is both complicated and important. Please see
|
|
||||||
# http://httpd.apache.org/docs/2.4/mod/core.html#options
|
|
||||||
# for more information.
|
|
||||||
#
|
|
||||||
Options FollowSymLinks
|
|
||||||
|
|
||||||
#
|
|
||||||
# AllowOverride controls what directives may be placed in .htaccess files.
|
|
||||||
# It can be "All", "None", or any combination of the keywords:
|
|
||||||
# AllowOverride FileInfo AuthConfig Limit
|
|
||||||
#
|
|
||||||
AllowOverride FileInfo AuthConfig Limit
|
|
||||||
|
|
||||||
#
|
|
||||||
# Controls who can get stuff from this server.
|
|
||||||
#
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
#
|
|
||||||
# DirectoryIndex: sets the file that Apache will serve if a directory
|
|
||||||
# is requested.
|
|
||||||
#
|
|
||||||
<IfModule dir_module>
|
|
||||||
DirectoryIndex index.php index.html
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
#
|
|
||||||
# The following lines prevent .htaccess and .htpasswd files from being
|
|
||||||
# viewed by Web clients.
|
|
||||||
#
|
|
||||||
<Files ".ht*">
|
|
||||||
Require all denied
|
|
||||||
</Files>
|
|
||||||
|
|
||||||
#
|
|
||||||
# ErrorLog: The location of the error log file.
|
|
||||||
# If you do not specify an ErrorLog directive within a <VirtualHost>
|
|
||||||
# container, error messages relating to that virtual host will be
|
|
||||||
# logged here. If you *do* define an error logfile for a <VirtualHost>
|
|
||||||
# container, that host's errors will be logged there and not here.
|
|
||||||
#
|
|
||||||
ErrorLog /proc/self/fd/2
|
|
||||||
|
|
||||||
#
|
|
||||||
# LogLevel: Control the number of messages logged to the error_log.
|
|
||||||
# Possible values include: debug, info, notice, warn, error, crit,
|
|
||||||
# alert, emerg.
|
|
||||||
#
|
|
||||||
LogLevel warn
|
|
||||||
|
|
||||||
<IfModule log_config_module>
|
|
||||||
#
|
|
||||||
# The following directives define some format nicknames for use with
|
|
||||||
# a CustomLog directive (see below).
|
|
||||||
#
|
|
||||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
|
||||||
LogFormat "%h %l %u %t \"%r\" %>s %b" common
|
|
||||||
|
|
||||||
<IfModule logio_module>
|
|
||||||
# You need to enable mod_logio.c to use %I and %O
|
|
||||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
#
|
|
||||||
# The location and format of the access logfile (Common Logfile Format).
|
|
||||||
# If you do not define any access logfiles within a <VirtualHost>
|
|
||||||
# container, they will be logged here. Contrariwise, if you *do*
|
|
||||||
# define per-<VirtualHost> access logfiles, transactions will be
|
|
||||||
# logged therein and *not* in this file.
|
|
||||||
#
|
|
||||||
CustomLog /proc/self/fd/1 common
|
|
||||||
|
|
||||||
#
|
|
||||||
# If you prefer a logfile with access, agent, and referer information
|
|
||||||
# (Combined Logfile Format) you can use the following directive.
|
|
||||||
#
|
|
||||||
#CustomLog "logs/access_log" combined
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
<IfModule alias_module>
|
|
||||||
#
|
|
||||||
# Redirect: Allows you to tell clients about documents that used to
|
|
||||||
# exist in your server's namespace, but do not anymore. The client
|
|
||||||
# will make a new request for the document at its new location.
|
|
||||||
# Example:
|
|
||||||
# Redirect permanent /foo http://www.example.com/bar
|
|
||||||
|
|
||||||
#
|
|
||||||
# Alias: Maps web paths into filesystem paths and is used to
|
|
||||||
# access content that does not live under the DocumentRoot.
|
|
||||||
# Example:
|
|
||||||
# Alias /webpath /full/filesystem/path
|
|
||||||
#
|
|
||||||
# If you include a trailing / on /webpath then the server will
|
|
||||||
# require it to be present in the URL. You will also likely
|
|
||||||
# need to provide a <Directory> section to allow access to
|
|
||||||
# the filesystem path.
|
|
||||||
|
|
||||||
#
|
|
||||||
# ScriptAlias: This controls which directories contain server scripts.
|
|
||||||
# ScriptAliases are essentially the same as Aliases, except that
|
|
||||||
# documents in the target directory are treated as applications and
|
|
||||||
# run by the server when requested rather than as documents sent to the
|
|
||||||
# client. The same rules about trailing "/" apply to ScriptAlias
|
|
||||||
# directives as to Alias.
|
|
||||||
#
|
|
||||||
ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
|
|
||||||
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
<IfModule cgid_module>
|
|
||||||
#
|
|
||||||
# ScriptSock: On threaded servers, designate the path to the UNIX
|
|
||||||
# socket used to communicate with the CGI daemon of mod_cgid.
|
|
||||||
#
|
|
||||||
#Scriptsock cgisock
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
#
|
|
||||||
# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased
|
|
||||||
# CGI directory exists, if you have that configured.
|
|
||||||
#
|
|
||||||
<Directory "/usr/local/apache2/cgi-bin">
|
|
||||||
AllowOverride None
|
|
||||||
Options None
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
<IfModule headers_module>
|
|
||||||
#
|
|
||||||
# Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
|
|
||||||
# backend servers which have lingering "httpoxy" defects.
|
|
||||||
# 'Proxy' request header is undefined by the IETF, not listed by IANA
|
|
||||||
#
|
|
||||||
RequestHeader unset Proxy early
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
<IfModule mime_module>
|
|
||||||
#
|
|
||||||
# TypesConfig points to the file containing the list of mappings from
|
|
||||||
# filename extension to MIME-type.
|
|
||||||
#
|
|
||||||
TypesConfig conf/mime.types
|
|
||||||
|
|
||||||
#
|
|
||||||
# AddType allows you to add to or override the MIME configuration
|
|
||||||
# file specified in TypesConfig for specific file types.
|
|
||||||
#
|
|
||||||
#AddType application/x-gzip .tgz
|
|
||||||
#
|
|
||||||
# AddEncoding allows you to have certain browsers uncompress
|
|
||||||
# information on the fly. Note: Not all browsers support this.
|
|
||||||
#
|
|
||||||
#AddEncoding x-compress .Z
|
|
||||||
#AddEncoding x-gzip .gz .tgz
|
|
||||||
#
|
|
||||||
# If the AddEncoding directives above are commented-out, then you
|
|
||||||
# probably should define those extensions to indicate media types:
|
|
||||||
#
|
|
||||||
AddType application/x-compress .Z
|
|
||||||
AddType application/x-gzip .gz .tgz
|
|
||||||
|
|
||||||
#
|
|
||||||
# AddHandler allows you to map certain file extensions to "handlers":
|
|
||||||
# actions unrelated to filetype. These can be either built into the server
|
|
||||||
# or added with the Action directive (see below)
|
|
||||||
#
|
|
||||||
# To use CGI scripts outside of ScriptAliased directories:
|
|
||||||
# (You will also need to add "ExecCGI" to the "Options" directive.)
|
|
||||||
#
|
|
||||||
#AddHandler cgi-script .cgi
|
|
||||||
|
|
||||||
# For type maps (negotiated resources):
|
|
||||||
#AddHandler type-map var
|
|
||||||
|
|
||||||
#
|
|
||||||
# Filters allow you to process content before it is sent to the client.
|
|
||||||
#
|
|
||||||
# To parse .shtml files for server-side includes (SSI):
|
|
||||||
# (You will also need to add "Includes" to the "Options" directive.)
|
|
||||||
#
|
|
||||||
#AddType text/html .shtml
|
|
||||||
#AddOutputFilter INCLUDES .shtml
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
#
|
|
||||||
# The mod_mime_magic module allows the server to use various hints from the
|
|
||||||
# contents of the file itself to determine its type. The MIMEMagicFile
|
|
||||||
# directive tells the module where the hint definitions are located.
|
|
||||||
#
|
|
||||||
#MIMEMagicFile conf/magic
|
|
||||||
|
|
||||||
#
|
|
||||||
# Customizable error responses come in three flavors:
|
|
||||||
# 1) plain text 2) local redirects 3) external redirects
|
|
||||||
#
|
|
||||||
# Some examples:
|
|
||||||
#ErrorDocument 500 "The server made a boo boo."
|
|
||||||
#ErrorDocument 404 /missing.html
|
|
||||||
#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
|
|
||||||
#ErrorDocument 402 http://www.example.com/subscription_info.html
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# MaxRanges: Maximum number of Ranges in a request before
|
|
||||||
# returning the entire resource, or one of the special
|
|
||||||
# values 'default', 'none' or 'unlimited'.
|
|
||||||
# Default setting is to accept 200 Ranges.
|
|
||||||
#MaxRanges unlimited
|
|
||||||
|
|
||||||
#
|
|
||||||
# EnableMMAP and EnableSendfile: On systems that support it,
|
|
||||||
# memory-mapping or the sendfile syscall may be used to deliver
|
|
||||||
# files. This usually improves server performance, but must
|
|
||||||
# be turned off when serving from networked-mounted
|
|
||||||
# filesystems or if support for these functions is otherwise
|
|
||||||
# broken on your system.
|
|
||||||
# Defaults: EnableMMAP On, EnableSendfile Off
|
|
||||||
#
|
|
||||||
#EnableMMAP off
|
|
||||||
#EnableSendfile on
|
|
||||||
|
|
||||||
# Supplemental configuration
|
|
||||||
#
|
|
||||||
# The configuration files in the conf/extra/ directory can be
|
|
||||||
# included to add extra features or to modify the default configuration of
|
|
||||||
# the server, or you may simply copy their contents here and change as
|
|
||||||
# necessary.
|
|
||||||
|
|
||||||
# Server-pool management (MPM specific)
|
|
||||||
#Include conf/extra/httpd-mpm.conf
|
|
||||||
|
|
||||||
# Multi-language error messages
|
|
||||||
#Include conf/extra/httpd-multilang-errordoc.conf
|
|
||||||
|
|
||||||
# Fancy directory listings
|
|
||||||
#Include conf/extra/httpd-autoindex.conf
|
|
||||||
|
|
||||||
# Language settings
|
|
||||||
#Include conf/extra/httpd-languages.conf
|
|
||||||
|
|
||||||
# User home directories
|
|
||||||
#Include conf/extra/httpd-userdir.conf
|
|
||||||
|
|
||||||
# Real-time info on requests and configuration
|
|
||||||
#Include conf/extra/httpd-info.conf
|
|
||||||
|
|
||||||
# Virtual hosts
|
|
||||||
#Include conf/extra/httpd-vhosts.conf
|
|
||||||
|
|
||||||
# Local access to the Apache HTTP Server Manual
|
|
||||||
#Include conf/extra/httpd-manual.conf
|
|
||||||
|
|
||||||
# Distributed authoring and versioning (WebDAV)
|
|
||||||
#Include conf/extra/httpd-dav.conf
|
|
||||||
|
|
||||||
# Various default settings
|
|
||||||
#Include conf/extra/httpd-default.conf
|
|
||||||
|
|
||||||
# Configure mod_proxy_html to understand HTML4/XHTML1
|
|
||||||
<IfModule proxy_html_module>
|
|
||||||
Include conf/extra/proxy-html.conf
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# Secure (SSL/TLS) connections
|
|
||||||
#Include conf/extra/httpd-ssl.conf
|
|
||||||
#
|
|
||||||
# Note: The following must must be present to support
|
|
||||||
# starting without SSL on platforms with no /dev/random equivalent
|
|
||||||
# but a statically compiled-in mod_ssl.
|
|
||||||
#
|
|
||||||
<IfModule ssl_module>
|
|
||||||
SSLRandomSeed startup builtin
|
|
||||||
SSLRandomSeed connect builtin
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
<IfModule http2_module>
|
|
||||||
LogLevel http2:info
|
|
||||||
ProtocolsHonorOrder On
|
|
||||||
Protocols h2 h2c http/1.1
|
|
||||||
H2Upgrade on
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# Redirect to local php-fpm if mod_php is not available
|
|
||||||
<IfModule !mod_php7.c>
|
|
||||||
<IfModule proxy_fcgi_module>
|
|
||||||
# Enable http authorization headers
|
|
||||||
<IfModule setenvif_module>
|
|
||||||
SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
<FilesMatch ".+\.ph(ar|p|tml)$">
|
|
||||||
#SetHandler "proxy:unix:/run/php/php7.3-fpm.sock|fcgi://localhost"
|
|
||||||
SetHandler "proxy:fcgi://app:9000/"
|
|
||||||
</FilesMatch>
|
|
||||||
<FilesMatch ".+\.phps$">
|
|
||||||
# Deny access to raw php sources by default
|
|
||||||
# To re-enable it's recommended to enable access to the files
|
|
||||||
# only in specific virtual host or directory
|
|
||||||
Require all denied
|
|
||||||
</FilesMatch>
|
|
||||||
# Deny access to files without filename (e.g. '.php')
|
|
||||||
<FilesMatch "^\.ph(ar|p|ps|tml)$">
|
|
||||||
Require all denied
|
|
||||||
</FilesMatch>
|
|
||||||
</IfModule>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# block direct access to templates, XML schemas, config files, dotfiles, environment info, etc.
|
||||||
|
location ~ ^/board/modules/editor/(skins|styles)/.+\.html$ {
|
||||||
|
# pass
|
||||||
|
}
|
||||||
|
location ~ ^/board/(addons|common/tpl|files/ruleset|(m\.)?layouts|modules|plugins|themes|widgets|widgetstyles)/.+\.(html|xml)$ {
|
||||||
|
return 403;
|
||||||
|
}
|
||||||
|
location ~ ^/board/files/(attach|config|cache/store)/.+\.(ph(p|t|ar)?[0-9]?|p?html?|cgi|pl|exe|[aj]spx?|inc|bak)$ {
|
||||||
|
return 403;
|
||||||
|
}
|
||||||
|
location ~ ^/board/files/(env|member_extra_info/(new_message_flags|point))/ {
|
||||||
|
return 403;
|
||||||
|
}
|
||||||
|
location ~ ^/board/(\.git|\.ht|\.travis|codeception\.|composer\.|Gruntfile\.js|package\.json|CONTRIBUTING|COPYRIGHT|LICENSE|README) {
|
||||||
|
return 403;
|
||||||
|
}
|
||||||
|
|
||||||
|
# fix incorrect relative URLs (for legacy support)
|
||||||
|
location ~ ^/board/(.+)/(addons|files|layouts|m\.layouts|modules|widgets|widgetstyles)/(.+) {
|
||||||
|
try_files $uri $uri/ /board/$2/$3;
|
||||||
|
}
|
||||||
|
|
||||||
|
# fix incorrect minified URLs (for legacy support)
|
||||||
|
location ~ ^/board/(.+)\.min\.(css|js)$ {
|
||||||
|
try_files $uri $uri/ /board/$1.$2;
|
||||||
|
}
|
||||||
|
|
||||||
|
# fix download URL when other directives for static files are present
|
||||||
|
location ~ ^/board/files/download/ {
|
||||||
|
try_files $uri $uri/ /board/index.php$is_args$args;
|
||||||
|
}
|
||||||
|
|
||||||
|
# all other short URLs
|
||||||
|
location /board/ {
|
||||||
|
try_files $uri $uri/ /board/index.php$is_args$args;
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
location ~ /\. {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /composer {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /package\.(json|lock) {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
location ~ /d_setting/ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /d_log/ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /logs/ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ ^/sam/node_modules {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ ^/sam/vendor/ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /tests {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /test-ts {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /npm_recent {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /composer_result {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /tsconfig.json {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /webpack.config.js {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /src {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ ^/sam/[^/]+/sammo/ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ ^/sam/[^/]+/data/ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user