diff --git a/.gitmodules b/.gitmodules index 331a5cc..528019f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,12 @@ [submodule "src/SpriteCoder"] path = src/SpriteCoder url = ../../Smashmaster/SpriteCoder.git +[submodule "src/CPluaEditor"] + path = src/CPluaEditor + url = ../../Ziqumu/CPluaEditor.git +[submodule "src/HPPrimeNotes"] + path = src/HPPrimeNotes + url = ../../Ziqumu/HPPrimeNotes.git +[submodule "src/PRGM2FUNC"] + path = src/PRGM2FUNC + url = ../../Ziqumu/PRGM2FUNC.git diff --git a/docker-compose.yml b/docker-compose.yml index 5cb0bcc..f6f6b07 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,9 @@ services: - ./src/G1rFxiTools:/www/G1rFxiTools/ - ./src/FestivAlgo:/www/FestivAlgo/ - ./src/SpriteCoder:/www/SpriteCoder/ + - ./src/CPluaEditor:/www/CPluaEditor/ + - ./src/HPPrimeNotes:/www/HPPrimeNotes/ + - ./src/PRGM2FUNC:/www/PRGM2FUNC/ - ./src/home:/www/home/ phpfpm-main: @@ -27,8 +30,10 @@ services: - ./src/SH4compatibilityTool:/www/SH4compatibilityTool/ - ./src/G1rFxiTools:/www/G1rFxiTools/ - ./src/SpriteCoder:/www/SpriteCoder/ + - ./src/CPluaEditor:/www/CPluaEditor/ + - ./src/HPPrimeNotes:/www/HPPrimeNotes/ + - ./src/PRGM2FUNC:/www/PRGM2FUNC/ - ./src/home:/www/home/ - phpfpm-festivalgo: build: context: ./php-docker/ diff --git a/nginx.conf b/nginx.conf index be01993..a7b6ca2 100644 --- a/nginx.conf +++ b/nginx.conf @@ -15,7 +15,7 @@ server { rewrite ^/?$ /home/index.php; # Forward to the main php-fpm container - location ~ ^/(home|EactMaker|SH4compatibilityTool|G1rFxiTools|SpriteCoder)/.*\.php$ { + location ~ ^/(home|EactMaker|SH4compatibilityTool|G1rFxiTools|SpriteCoder|CPluaEditor|HPPrimeNotes|PRGM2FUNC)/.*\.php$ { try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass phpfpm-main:9000; diff --git a/php-docker/entrypoint.sh b/php-docker/entrypoint.sh index 685cfea..b677dc0 100755 --- a/php-docker/entrypoint.sh +++ b/php-docker/entrypoint.sh @@ -3,11 +3,21 @@ set -e # Set the whole project in read-only mode chmod -R a=rX /www/ -# Per project exceptions: + +# Per project init script # SpriteCoder if [ -d /www/SpriteCoder ] ; then mkdir -p /www/SpriteCoder/upload chmod a+w /www/SpriteCoder/upload fi +# accent-remover +if [ -d /www/accent-remover ] ; then + if [ ! -f /www/accent-remover/count ] ; then + echo "0" > /www/accent-remover/count + fi + chmod a+w /www/accent-remover/count + mkdir -p /www/accent-remover/txt + chmod a+w /www/accent-remover/txt +fi exec docker-php-entrypoint "$@" \ No newline at end of file diff --git a/src/CPluaEditor b/src/CPluaEditor new file mode 160000 index 0000000..9f9cd81 --- /dev/null +++ b/src/CPluaEditor @@ -0,0 +1 @@ +Subproject commit 9f9cd811deeddfc31bbdc14956667e97a791e4da diff --git a/src/HPPrimeNotes b/src/HPPrimeNotes new file mode 160000 index 0000000..a609abb --- /dev/null +++ b/src/HPPrimeNotes @@ -0,0 +1 @@ +Subproject commit a609abbca4fdb84ea3957733eb2b993136767656 diff --git a/src/PRGM2FUNC b/src/PRGM2FUNC new file mode 160000 index 0000000..c2a393b --- /dev/null +++ b/src/PRGM2FUNC @@ -0,0 +1 @@ +Subproject commit c2a393b295897d96da2b01a436529392ae1f8188 diff --git a/src/home/index.php b/src/home/index.php index 53c653b..f63be08 100644 --- a/src/home/index.php +++ b/src/home/index.php @@ -13,19 +13,16 @@

This website regroup some web tools for casio calculators developed by different people.