diff --git a/ct/zammad.sh b/ct/zammad.sh index 2c582cce92..108a6c1d73 100644 --- a/ct/zammad.sh +++ b/ct/zammad.sh @@ -11,7 +11,7 @@ var_disk="${var_disk:-8}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-4096}" var_os="${var_os:-debian}" -var_version="${var_version:-13}" +var_version="${var_version:-12}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/frontend/public/json/zammad.json b/frontend/public/json/zammad.json index ebfec92c3e..a892db7cc2 100644 --- a/frontend/public/json/zammad.json +++ b/frontend/public/json/zammad.json @@ -23,7 +23,7 @@ "ram": 4096, "hdd": 8, "os": "debian", - "version": "13" + "version": "12" } } ], diff --git a/install/zammad-install.sh b/install/zammad-install.sh index 69712c4a69..6c291a2479 100644 --- a/install/zammad-install.sh +++ b/install/zammad-install.sh @@ -21,15 +21,12 @@ $STD apt install -y \ msg_ok "Installed Dependencies" msg_info "Setting up Elasticsearch" -curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg -cat </dev/null -Types: deb -URIs: https://artifacts.elastic.co/packages/7.x/apt -Suites: stable -Components: main -Signed-By: /usr/share/keyrings/elasticsearch-keyring.gpg -EOF -$STD apt update +setup_deb822_repo \ + "elasticsearch" \ + "https://artifacts.elastic.co/GPG-KEY-elasticsearch" \ + "https://artifacts.elastic.co/packages/7.x/apt" \ + "stable" \ + "main" $STD apt -y install elasticsearch echo "-Xms2g" >>/etc/elasticsearch/jvm.options echo "-Xmx2g" >>/etc/elasticsearch/jvm.options @@ -39,15 +36,12 @@ systemctl restart -q elasticsearch msg_ok "Setup Elasticsearch" msg_info "Installing Zammad" -curl -fsSL https://dl.packager.io/srv/zammad/zammad/key | gpg --dearmor | sudo tee /etc/apt/keyrings/pkgr-zammad.gpg >/dev/null -cat </dev/null -Types: deb -URIs: https://dl.packager.io/srv/deb/zammad/zammad/stable/debian -Suites: 12 -Components: main -Signed-By: /etc/apt/keyrings/pkgr-zammad.gpg -EOF -$STD apt update +setup_deb822_repo \ + "zammad" \ + "https://dl.packager.io/srv/zammad/zammad/key" \ + "https://dl.packager.io/srv/deb/zammad/zammad/stable/debian" \ + "$(get_os_info version_id)" \ + "main" $STD apt -y install zammad $STD zammad run rails r "Setting.set('es_url', 'http://localhost:9200')" $STD zammad run rake zammad:searchindex:rebuild