Updated backup procedure for matrix and deactivated plugin chatgpt and slack

This commit is contained in:
Kevin Veen-Birkenbach 2024-11-07 16:42:45 -03:00
parent ae23e8811e
commit ce1b667459
4 changed files with 62 additions and 49 deletions

View File

@ -96,9 +96,17 @@
dest: "{{docker_compose_instance_directory}}docker-compose.yml" dest: "{{docker_compose_instance_directory}}docker-compose.yml"
notify: docker compose project setup notify: docker compose project setup
# Pull image when update is wished.
# @todo This should be moved to update-docker
- name: docker compose pull
command:
cmd: docker-compose -p "{{docker_compose_project_name}}" pull
chdir: "{{docker_compose_instance_directory}}"
when: mode_update | bool
- name: docker compose project setup - name: docker compose project setup
command: command:
cmd: docker-compose -p "{{docker_compose_project_name}}" up -d --force-recreate cmd: docker-compose -p "{{docker_compose_project_name}}" up -d
chdir: "{{docker_compose_instance_directory}}" chdir: "{{docker_compose_instance_directory}}"
environment: environment:
COMPOSE_HTTP_TIMEOUT: 600 COMPOSE_HTTP_TIMEOUT: 600

View File

@ -61,49 +61,50 @@ services:
retries: 3 retries: 3
{% include 'templates/docker/container/networks.yml.j2' %} {% include 'templates/docker/container/networks.yml.j2' %}
{% endfor %} {% endfor %}
# Deactivated chatgpt.
matrix-chatgpt-bot: # @todo needs to be reactivated as soon as bug is found
restart: {{docker_restart_policy}} # matrix-chatgpt-bot:
container_name: matrix-chatgpt # restart: {{docker_restart_policy}}
image: ghcr.io/matrixgpt/matrix-chatgpt-bot:latest # container_name: matrix-chatgpt
volumes: # image: ghcr.io/matrixgpt/matrix-chatgpt-bot:latest
- chatgpt_data:/storage # volumes:
environment: # - chatgpt_data:/storage
OPENAI_API_KEY: '{{matrix_chatgpt_bridge_openai_api_key}}' # environment:
# Uncomment the next two lines if you are using Azure OpenAI API # OPENAI_API_KEY: '{{matrix_chatgpt_bridge_openai_api_key}}'
# OPENAI_AZURE: 'false' # # Uncomment the next two lines if you are using Azure OpenAI API
# CHATGPT_REVERSE_PROXY: 'your-completion-endpoint-here' # # OPENAI_AZURE: 'false'
CHATGPT_CONTEXT: 'thread' # # CHATGPT_REVERSE_PROXY: 'your-completion-endpoint-here'
CHATGPT_API_MODEL: 'gpt-3.5-turbo' # CHATGPT_CONTEXT: 'thread'
# Uncomment and edit the next line if needed # CHATGPT_API_MODEL: 'gpt-3.5-turbo'
# CHATGPT_PROMPT_PREFIX: 'Instructions:\nYou are ChatGPT, a large language model trained by OpenAI.' # # Uncomment and edit the next line if needed
# CHATGPT_IGNORE_MEDIA: 'false' # # CHATGPT_PROMPT_PREFIX: 'Instructions:\nYou are ChatGPT, a large language model trained by OpenAI.'
CHATGPT_REVERSE_PROXY: 'https://api.openai.com/v1/chat/completions' # # CHATGPT_IGNORE_MEDIA: 'false'
# Uncomment and edit the next line if needed # CHATGPT_REVERSE_PROXY: 'https://api.openai.com/v1/chat/completions'
# CHATGPT_TEMPERATURE: '0.8' # # Uncomment and edit the next line if needed
# Uncomment and edit the next line if needed # # CHATGPT_TEMPERATURE: '0.8'
# CHATGPT_MAX_CONTEXT_TOKENS: '4097' # # Uncomment and edit the next line if needed
# CHATGPT_MAX_PROMPT_TOKENS: '3097' # #CHATGPT_MAX_CONTEXT_TOKENS: '4097'
KEYV_BACKEND: 'file' # CHATGPT_MAX_PROMPT_TOKENS: '3000'
KEYV_URL: '' # KEYV_BACKEND: 'file'
KEYV_BOT_ENCRYPTION: 'false' # KEYV_URL: ''
KEYV_BOT_STORAGE: 'true' # KEYV_BOT_ENCRYPTION: 'false'
MATRIX_HOMESERVER_URL: 'https://{{synapse_domain}}' # KEYV_BOT_STORAGE: 'true'
MATRIX_BOT_USERNAME: '@chatgptbot:{{matrix_server_name}}' # MATRIX_HOMESERVER_URL: 'https://{{synapse_domain}}'
MATRIX_ACCESS_TOKEN: '{{ matrix_chatgpt_bridge_access_token | default('') }}' # MATRIX_BOT_USERNAME: '@chatgptbot:{{matrix_server_name}}'
MATRIX_BOT_PASSWORD: '{{matrix_chatgpt_bridge_user_password}}' # MATRIX_ACCESS_TOKEN: '{{ matrix_chatgpt_bridge_access_token | default('') }}'
MATRIX_DEFAULT_PREFIX: '!chatgpt' # MATRIX_BOT_PASSWORD: '{{matrix_chatgpt_bridge_user_password}}'
MATRIX_DEFAULT_PREFIX_REPLY: 'false' # MATRIX_DEFAULT_PREFIX: '!chatgpt'
#MATRIX_BLACKLIST: '' # MATRIX_DEFAULT_PREFIX_REPLY: 'false'
MATRIX_WHITELIST: ':{{matrix_server_name}}' # #MATRIX_BLACKLIST: ''
MATRIX_AUTOJOIN: 'true' # MATRIX_WHITELIST: ':{{matrix_server_name}}'
MATRIX_ENCRYPTION: 'true' # MATRIX_AUTOJOIN: 'true'
MATRIX_THREADS: 'true' # MATRIX_ENCRYPTION: 'true'
MATRIX_PREFIX_DM: 'false' # MATRIX_THREADS: 'true'
MATRIX_RICH_TEXT: 'true' # MATRIX_PREFIX_DM: 'false'
# MATRIX_RICH_TEXT: 'true'
{% include 'templates/docker/compose/volumes.yml.j2' %} {% include 'templates/docker/compose/volumes.yml.j2' %}
synapse_data: synapse_data:
chatgpt_data: # chatgpt_data:
{% include 'templates/docker/compose/networks.yml.j2' %} {% include 'templates/docker/compose/networks.yml.j2' %}

View File

@ -21,10 +21,12 @@ bridges:
database_name: "mautrix_signal_bridge" database_name: "mautrix_signal_bridge"
bridge_name: "signal" bridge_name: "signal"
- database_password: "{{ mautrix_slack_bridge_database_password }}" # Deactivated temporary, due to bug which is hard to find
database_username: "mautrix_slack_bridge" # @todo Reactivate
database_name: "mautrix_slack_bridge" # - database_password: "{{ mautrix_slack_bridge_database_password }}"
bridge_name: "slack" # database_username: "mautrix_slack_bridge"
# database_name: "mautrix_slack_bridge"
# bridge_name: "slack"
- database_password: "{{ mautrix_facebook_bridge_database_password }}" - database_password: "{{ mautrix_facebook_bridge_database_password }}"
database_username: "mautrix_facebook_bridge" database_username: "mautrix_facebook_bridge"

View File

@ -123,7 +123,6 @@ def update_procedure(command):
print("All attempts to update Nextcloud apps have failed.") print("All attempts to update Nextcloud apps have failed.")
raise # Re-raise the last exception after all attempts fail raise # Re-raise the last exception after all attempts fail
def start_docker(directory): def start_docker(directory):
if is_any_service_up(): if is_any_service_up():
print(f"Restarting containers in {directory}.") print(f"Restarting containers in {directory}.")
@ -153,8 +152,11 @@ if __name__ == "__main__":
else: else:
print("Discourse update skipped. No changes in git repository.") print("Discourse update skipped. No changes in git repository.")
if os.path.basename(dir_path) == "matrix": if os.path.basename(dir_path) == "matrix":
# Just pull docker images, the rest of the logic is executed in the task # No autoupdate for matrix is possible atm,
pull_docker_images() # due to the reason that the role has to be executed every time.
# The update has to be executed in the role
# @todo implement in future
pass
else: else:
# Pull and update docker images # Pull and update docker images
update_docker(dir_path) update_docker(dir_path)