diff --git a/.gitignore b/.gitignore index 7d8d2ed..ba4d4e9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ obj *.user log* *.cmd - Content/ +Content/ .env \ No newline at end of file diff --git a/Azaion.Api/Program.cs b/Azaion.Api/Program.cs index 4d8c1ce..d06ae17 100644 --- a/Azaion.Api/Program.cs +++ b/Azaion.Api/Program.cs @@ -1,5 +1,4 @@ using System.Text; -using Azaion.Common; using Azaion.Common.Configs; using Azaion.Common.Database; using Azaion.Common.Entities; @@ -142,7 +141,7 @@ app.MapPost("/resources/{dataFolder?}", async ([FromRoute]string? dataFolder, IFormFile data, IResourcesService resourceService, CancellationToken cancellationToken) => await resourceService.SaveResource(dataFolder, data, cancellationToken)) .Accepts("multipart/form-data") - .RequireAuthorization(apiUploaderPolicy) + .RequireAuthorization() .DisableAntiforgery(); app.MapPost("/resources/get/{dataFolder?}", //Need to have POST method for secure password diff --git a/Azaion.Services/ResourcesService.cs b/Azaion.Services/ResourcesService.cs index 586134a..612c310 100644 --- a/Azaion.Services/ResourcesService.cs +++ b/Azaion.Services/ResourcesService.cs @@ -40,6 +40,7 @@ public class ResourcesService(IOptions resourcesConfig, ILogger Directory.CreateDirectory(resourceFolder); var resourcePath = Path.Combine(resourceFolder, data.FileName); + File.Delete(resourcePath); await using var fileStream = new FileStream(resourcePath, FileMode.OpenOrCreate, FileAccess.ReadWrite); await data.CopyToAsync(fileStream, cancellationToken); logger.LogInformation($"Resource {data.FileName} Saved Successfully"); diff --git a/env/01 sh-install/03-rabbit-configure.sh b/env/01 sh-install/03-rabbit-configure.sh index 169cfc5..c23217a 100644 --- a/env/01 sh-install/03-rabbit-configure.sh +++ b/env/01 sh-install/03-rabbit-configure.sh @@ -31,7 +31,7 @@ rabbitmqctl set_permissions azaion_receiver "" "" ".*" # 2.2 declare queues with x-queue-type stream: rabbitmqadmin declare queue name=azaion-annotations arguments='{"x-queue-type": "stream", "max-segment-size-bytes": 5368709118}' rabbitmqadmin declare queue name=azaion-annotations-confirm arguments='{"x-queue-type": "stream", "max-segment-size-bytes": 5368709118}' - + rabbitmqadmin declare queue name=azaion-commands # 2.3 configure rabbitmq # edit /etc/rabbitmq/rabbitmq.conf # put here: diff --git a/env/01 sh-install/05 start scripts/start-container.sh b/env/01 sh-install/05 start scripts/start-container.sh index f969c6e..102b862 100644 --- a/env/01 sh-install/05 start scripts/start-container.sh +++ b/env/01 sh-install/05 start scripts/start-container.sh @@ -2,4 +2,5 @@ --env-file .env \ -p 4000:8080 \ -v /root/content:/app/Content \ + -v /root/logs:/app/logs --name azaion.api docker.azaion.com/api \ No newline at end of file