fix think-backend upload and get avartar image
This commit is contained in:
@@ -263,6 +263,7 @@ in
|
|||||||
# migrate & seed db
|
# migrate & seed db
|
||||||
${lib.getExe php} artisan key:generate --force
|
${lib.getExe php} artisan key:generate --force
|
||||||
${lib.getExe php} artisan migrate --force
|
${lib.getExe php} artisan migrate --force
|
||||||
|
${lib.getExe php} artisan storage:link
|
||||||
${lib.getExe php} artisan config:cache
|
${lib.getExe php} artisan config:cache
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -270,8 +271,8 @@ in
|
|||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d ${cfg.dataDir} 0710 ${cfg.user} ${cfg.group} - -"
|
"d ${cfg.dataDir} 0710 ${cfg.user} ${cfg.group} - -"
|
||||||
"d ${cfg.dataDir}/cache 0700 ${cfg.user} ${cfg.group} - -"
|
"d ${cfg.dataDir}/cache 0700 ${cfg.user} ${cfg.group} - -"
|
||||||
"d ${cfg.dataDir}/public 0750 ${cfg.user} ${cfg.group} - -"
|
"d ${cfg.dataDir}/public 0755 ${cfg.user} ${cfg.group} - -"
|
||||||
"d ${cfg.dataDir}/public/uploads 0750 ${cfg.user} ${cfg.group} - -"
|
"d ${cfg.dataDir}/public/uploads 0755 ${cfg.user} ${cfg.group} - -"
|
||||||
"d ${cfg.dataDir}/storage 0700 ${cfg.user} ${cfg.group} - -"
|
"d ${cfg.dataDir}/storage 0700 ${cfg.user} ${cfg.group} - -"
|
||||||
"d ${cfg.dataDir}/storage/app 0700 ${cfg.user} ${cfg.group} - -"
|
"d ${cfg.dataDir}/storage/app 0700 ${cfg.user} ${cfg.group} - -"
|
||||||
"d ${cfg.dataDir}/storage/fonts 0700 ${cfg.user} ${cfg.group} - -"
|
"d ${cfg.dataDir}/storage/fonts 0700 ${cfg.user} ${cfg.group} - -"
|
||||||
@@ -304,6 +305,16 @@ in
|
|||||||
index = "index.php";
|
index = "index.php";
|
||||||
tryFiles = "$uri $uri/ /index.php?$query_string";
|
tryFiles = "$uri $uri/ /index.php?$query_string";
|
||||||
};
|
};
|
||||||
|
"/uploads" = {
|
||||||
|
root = "${cfg.dataDir}/public/uploads";
|
||||||
|
index = "index.php index.html";
|
||||||
|
tryFiles = "$uri $uri/ /index.php";
|
||||||
|
};
|
||||||
|
"/storage" = {
|
||||||
|
root = "${cfg.dataDir}/public/storage";
|
||||||
|
index = "index.php index.html";
|
||||||
|
tryFiles = "$uri $uri/ /index.php";
|
||||||
|
};
|
||||||
"~ \\.php$".extraConfig = ''
|
"~ \\.php$".extraConfig = ''
|
||||||
fastcgi_pass unix:${config.services.phpfpm.pools."think-backend-gtcm".socket};
|
fastcgi_pass unix:${config.services.phpfpm.pools."think-backend-gtcm".socket};
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -228,6 +228,7 @@ in
|
|||||||
# migrate & seed db
|
# migrate & seed db
|
||||||
${lib.getExe php} artisan key:generate --force
|
${lib.getExe php} artisan key:generate --force
|
||||||
${lib.getExe php} artisan migrate --force
|
${lib.getExe php} artisan migrate --force
|
||||||
|
${lib.getExe php} artisan storage:link
|
||||||
${lib.getExe php} artisan config:cache
|
${lib.getExe php} artisan config:cache
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -267,7 +268,16 @@ in
|
|||||||
index = "index.php";
|
index = "index.php";
|
||||||
tryFiles = "$uri $uri/ /index.php?$query_string";
|
tryFiles = "$uri $uri/ /index.php?$query_string";
|
||||||
};
|
};
|
||||||
|
"/uploads" = {
|
||||||
|
root = "${cfg.dataDir}/public/uploads";
|
||||||
|
index = "index.php index.html";
|
||||||
|
tryFiles = "$uri $uri/ /index.php";
|
||||||
|
};
|
||||||
|
"/storage" = {
|
||||||
|
root = "${cfg.dataDir}/public/storage";
|
||||||
|
index = "index.php index.html";
|
||||||
|
tryFiles = "$uri $uri/ /index.php";
|
||||||
|
};
|
||||||
"~ \\.php$".extraConfig = ''
|
"~ \\.php$".extraConfig = ''
|
||||||
fastcgi_pass unix:${config.services.phpfpm.pools."think-gtcm".socket};
|
fastcgi_pass unix:${config.services.phpfpm.pools."think-gtcm".socket};
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -21,9 +21,13 @@ php.buildComposerProject2 (finalAttrs: {
|
|||||||
runHook preInstall
|
runHook preInstall
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp -R * $out
|
cp -R * $out
|
||||||
|
|
||||||
rm -rf $out/storage
|
rm -rf $out/storage
|
||||||
|
|
||||||
ln -s ${dataDir}/.env $out/.env
|
ln -s ${dataDir}/.env $out/.env
|
||||||
ln -s ${dataDir}/storage $out/storage
|
ln -s ${dataDir}/storage $out/storage
|
||||||
|
ln -s ${dataDir}/public/storage $out/public/storage
|
||||||
|
ln -s ${dataDir}/public/uploads $out/public/uploads
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
@@ -21,9 +21,13 @@ php.buildComposerProject2 (finalAttrs: {
|
|||||||
runHook preInstall
|
runHook preInstall
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp -R * $out
|
cp -R * $out
|
||||||
|
|
||||||
rm -rf $out/storage
|
rm -rf $out/storage
|
||||||
|
|
||||||
ln -s ${dataDir}/.env $out/.env
|
ln -s ${dataDir}/.env $out/.env
|
||||||
ln -s ${dataDir}/storage $out/storage
|
ln -s ${dataDir}/storage $out/storage
|
||||||
|
ln -s ${dataDir}/public/storage $out/public/storage
|
||||||
|
ln -s ${dataDir}/public/uploads $out/public/uploads
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user