Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rejected directory settings #1873

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Fix rejected directory settings #1873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/MCPClient/install/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ This is the full list of variables supported by MCPClient:
- **Description:** location of the Archivematica Rejected Directory.
- **Config file example:** `MCPClient.rejectedDirectory`
- **Type:** `string`
- **Default:** `%%sharedPath%%rejected/`
- **Default:** `/var/archivematica/sharedDirectory/rejected/`

- **`ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_WATCHDIRECTORYPATH`**:
- **Description:** location of the Archivematica Watched Directories.
Expand Down
2 changes: 1 addition & 1 deletion src/MCPClient/install/clientConfig.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MCPArchivematicaServer = localhost:4730
sharedDirectoryMounted = /var/archivematica/sharedDirectory/
watchDirectoryPath = /var/archivematica/sharedDirectory/watchedDirectories/
processingDirectory = /var/archivematica/sharedDirectory/currentlyProcessing/
rejectedDirectory = %%sharedPath%%rejected/
rejectedDirectory = /var/archivematica/sharedDirectory/rejected/
archivematicaClientModules = /usr/lib/archivematica/MCPClient/archivematicaClientModules
clientScriptsDirectory = /usr/lib/archivematica/MCPClient/clientScripts/
clientAssetsDirectory = /usr/lib/archivematica/MCPClient/assets/
Expand Down
2 changes: 1 addition & 1 deletion src/MCPClient/lib/settings/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def _get_settings_from_file(path):
sharedDirectoryMounted = /var/archivematica/sharedDirectory/
watchDirectoryPath = /var/archivematica/sharedDirectory/watchedDirectories/
processingDirectory = /var/archivematica/sharedDirectory/currentlyProcessing/
rejectedDirectory = %%sharedPath%%rejected/
rejectedDirectory = /var/archivematica/sharedDirectory/rejected/
archivematicaClientModules = /usr/lib/archivematica/MCPClient/archivematicaClientModules
clientScriptsDirectory = /usr/lib/archivematica/MCPClient/clientScripts/
clientAssetsDirectory = /usr/lib/archivematica/MCPClient/assets/
Expand Down
2 changes: 1 addition & 1 deletion src/MCPServer/install/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ This is the full list of variables supported by MCPServer:
- **Description:** location of the rejected directory.
- **Config file example:** `MCPServer.rejectedDirectory`
- **Type:** `string`
- **Default:** `"%%sharedPath%%rejected/"`
- **Default:** `"/var/archivematica/sharedDirectory/rejected/"`

- **`ARCHIVEMATICA_MCPSERVER_MCPSERVER_WAITONAUTOAPPROVE`**:
- **Description:** number of seconds that a thread will wait before attempting to approve a chain when it is pre-configured.
Expand Down
2 changes: 1 addition & 1 deletion src/MCPServer/install/serverConfig.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MCPArchivematicaServer = localhost:4730
watchDirectoryPath = /var/archivematica/sharedDirectory/watchedDirectories/
sharedDirectory = /var/archivematica/sharedDirectory/
processingDirectory = /var/archivematica/sharedDirectory/currentlyProcessing/
rejectedDirectory = %%sharedPath%%rejected/
rejectedDirectory = /var/archivematica/sharedDirectory/rejected/
processingXMLFile = processingMCP.xml
waitOnAutoApprove = 0

Expand Down
2 changes: 1 addition & 1 deletion src/MCPServer/lib/settings/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
watchDirectoryPath = /var/archivematica/sharedDirectory/watchedDirectories/
sharedDirectory = /var/archivematica/sharedDirectory/
processingDirectory = /var/archivematica/sharedDirectory/currentlyProcessing/
rejectedDirectory = %%sharedPath%%rejected/
rejectedDirectory = /var/archivematica/sharedDirectory/rejected/
watch_directory_method = poll
watch_directory_interval = 1
processingXMLFile = processingMCP.xml
Expand Down