Skip to content

Commit a328d7b

Browse files
authored
fix(zammad): use Debian 12 and dynamic APT source version (#9750)
1 parent dfa4d82 commit a328d7b

File tree

3 files changed

+14
-20
lines changed

3 files changed

+14
-20
lines changed

ct/zammad.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var_disk="${var_disk:-8}"
1111
var_cpu="${var_cpu:-2}"
1212
var_ram="${var_ram:-4096}"
1313
var_os="${var_os:-debian}"
14-
var_version="${var_version:-13}"
14+
var_version="${var_version:-12}"
1515
var_unprivileged="${var_unprivileged:-1}"
1616

1717
header_info "$APP"

frontend/public/json/zammad.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ram": 4096,
2424
"hdd": 8,
2525
"os": "debian",
26-
"version": "13"
26+
"version": "12"
2727
}
2828
}
2929
],

install/zammad-install.sh

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ $STD apt install -y \
2121
msg_ok "Installed Dependencies"
2222

2323
msg_info "Setting up Elasticsearch"
24-
curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg
25-
cat <<EOF | sudo tee /etc/apt/sources.list.d/elasticsearch.sources >/dev/null
26-
Types: deb
27-
URIs: https://artifacts.elastic.co/packages/7.x/apt
28-
Suites: stable
29-
Components: main
30-
Signed-By: /usr/share/keyrings/elasticsearch-keyring.gpg
31-
EOF
32-
$STD apt update
24+
setup_deb822_repo \
25+
"elasticsearch" \
26+
"https://artifacts.elastic.co/GPG-KEY-elasticsearch" \
27+
"https://artifacts.elastic.co/packages/7.x/apt" \
28+
"stable" \
29+
"main"
3330
$STD apt -y install elasticsearch
3431
echo "-Xms2g" >>/etc/elasticsearch/jvm.options
3532
echo "-Xmx2g" >>/etc/elasticsearch/jvm.options
@@ -39,15 +36,12 @@ systemctl restart -q elasticsearch
3936
msg_ok "Setup Elasticsearch"
4037

4138
msg_info "Installing Zammad"
42-
curl -fsSL https://dl.packager.io/srv/zammad/zammad/key | gpg --dearmor | sudo tee /etc/apt/keyrings/pkgr-zammad.gpg >/dev/null
43-
cat <<EOF | sudo tee /etc/apt/sources.list.d/zammad.sources >/dev/null
44-
Types: deb
45-
URIs: https://dl.packager.io/srv/deb/zammad/zammad/stable/debian
46-
Suites: 12
47-
Components: main
48-
Signed-By: /etc/apt/keyrings/pkgr-zammad.gpg
49-
EOF
50-
$STD apt update
39+
setup_deb822_repo \
40+
"zammad" \
41+
"https://dl.packager.io/srv/zammad/zammad/key" \
42+
"https://dl.packager.io/srv/deb/zammad/zammad/stable/debian" \
43+
"$(get_os_info version_id)" \
44+
"main"
5145
$STD apt -y install zammad
5246
$STD zammad run rails r "Setting.set('es_url', 'http://localhost:9200')"
5347
$STD zammad run rake zammad:searchindex:rebuild

0 commit comments

Comments
 (0)