Refactor Cloudreve restart logic and update configs
- Refactor Cloudreve tasks to use conditional restart - Remove unused displayData from Dashy config - Add NVM and Japanese input setup to bash.nix
This commit is contained in:
@@ -19,14 +19,14 @@
|
|||||||
src: docker-compose.yml.j2
|
src: docker-compose.yml.j2
|
||||||
dest: "{{ cloudreve_service_dir }}/docker-compose.yml"
|
dest: "{{ cloudreve_service_dir }}/docker-compose.yml"
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
notify: restart_cloudreve
|
register: cloudreve_compose
|
||||||
|
|
||||||
- name: Stop Cloudreve service
|
- name: Stop Cloudreve service
|
||||||
ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" down --remove-orphans
|
ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" down --remove-orphans
|
||||||
changed_when: false
|
changed_when: false
|
||||||
listen: restart_cloudreve
|
when: cloudreve_compose.changed
|
||||||
|
|
||||||
- name: Start Cloudreve service
|
- name: Start Cloudreve service
|
||||||
ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" up -d
|
ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" up -d
|
||||||
changed_when: false
|
changed_when: false
|
||||||
listen: restart_cloudreve
|
when: cloudreve_compose.changed
|
||||||
|
|||||||
@@ -259,12 +259,6 @@ sections:
|
|||||||
- do
|
- do
|
||||||
- discount
|
- discount
|
||||||
- work
|
- work
|
||||||
displayData:
|
|
||||||
sortBy: default
|
|
||||||
rows: 1
|
|
||||||
cols: 1
|
|
||||||
collapsed: true
|
|
||||||
hideForGuests: true
|
|
||||||
appConfig:
|
appConfig:
|
||||||
layout: auto
|
layout: auto
|
||||||
iconSize: large
|
iconSize: large
|
||||||
|
|||||||
@@ -62,6 +62,13 @@
|
|||||||
eval "$(pyenv init - bash)"
|
eval "$(pyenv init - bash)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# NVM (if installed)
|
||||||
|
if [ -d "$HOME/.nvm" ]; then
|
||||||
|
export NVM_DIR="$HOME/.nvm"
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
|
fi
|
||||||
|
|
||||||
# Detect distribution and set CGO_CFLAGS for Pop!_OS
|
# Detect distribution and set CGO_CFLAGS for Pop!_OS
|
||||||
if [ -f /etc/os-release ]; then
|
if [ -f /etc/os-release ]; then
|
||||||
distro=$(awk -F= '/^NAME/{print $2}' /etc/os-release | tr -d '"')
|
distro=$(awk -F= '/^NAME/{print $2}' /etc/os-release | tr -d '"')
|
||||||
@@ -234,6 +241,11 @@
|
|||||||
if [ -d "${config.home.homeDirectory}/Projects/Work" ]; then
|
if [ -d "${config.home.homeDirectory}/Projects/Work" ]; then
|
||||||
export TRADAWARE_DEVOPS=true
|
export TRADAWARE_DEVOPS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Japanese input
|
||||||
|
export GTK_IM_MODULE=fcitx5
|
||||||
|
export QT_IM_MODULE=fcitx5
|
||||||
|
export XMODIFIERS="@im=fcitx5"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Interactive shell specific configuration
|
# Interactive shell specific configuration
|
||||||
|
|||||||
Reference in New Issue
Block a user