Merge branch 'zammad' of https://github.com/michelroegl-brunner/ProxmoxVE into zammad

ct/zammad.sh

@@ -25,25 +25,25 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-  if [[ ! -d /opt/zamad ]]; then
-    msg_error "No ${APP} Installation Found!"
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /opt/zamad ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_info "Stopping Service"
+    systemctl stop zammad &>/dev/null
+    msg_info "Updating ${APP}"
+    apt-get update &>/dev/null
+    apt-mark hold zammad &>/dev/null
+    apt-get -y upgrade &>/dev/null
+    apt-mark unhold zammad &>/dev/null
+    apt-get -y upgrade &>/dev/null
+    msg_info "Starting Service"
+    systemctl start zammad &>/dev/null
+    msg_ok "Updated ${APP} LXC"
     exit
-  fi
-  msg_info "Stopping Service"
-  systemctl stop zammad &>/dev/null
-  msg_info "Updating ${APP}"
-  apt-get update &>/dev/null
-  apt-mark hold zammad &>/dev/null
-  apt-get -y upgrade &>/dev/null
-  apt-mark unhold zammad &>/dev/null
-  apt-get -y upgrade &>/dev/null
-  msg_info "Starting Service"
-  systemctl start zammad &>/dev/null
-  msg_ok "Updated ${APP} LXC"
-  exit
 }
 
 start
@@ -53,4 +53,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}"

install/zammad-install.sh

@@ -20,23 +20,25 @@ $STD apt-get install -y \
   sudo \
   gpg \
   wget \
-  nginx
+  nginx \
+  apt-transport-https \
+  gnupg 
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Elasticsearch"
-echo "deb [signed-by=/etc/apt/trusted.gpg.d/elasticsearch.gpg] https://artifacts.elastic.co/packages/7.x/apt stable main"| tee -a /etc/apt/sources.list.d/elastic-7.x.list 
-curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/7.x/apt stable main" | sudo tee /etc/apt/sources.list.d/elastic-7.x.list >/dev/null
 $STD apt-get update
 $STD apt-get -y install elasticsearch
-echo "-Xms2g" >> /etc/elasticsearch/jvm.options
-echo "-Xmx2g" >> /etc/elasticsearch/jvm.options
+echo "-Xms2g" >>/etc/elasticsearch/jvm.options
+echo "-Xmx2g" >>/etc/elasticsearch/jvm.options
 $STD /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment -b
 systemctl -q restart 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
-echo "deb [signed-by=/etc/apt/keyrings/pkgr-zammad.gpg] https://dl.packager.io/srv/deb/zammad/zammad/stable/debian 12 main"| sudo tee /etc/apt/sources.list.d/zammad.list > /dev/null
+curl -fsSL https://dl.packager.io/srv/zammad/zammad/key | gpg --dearmor | sudo tee /etc/apt/keyrings/pkgr-zammad.gpg >/dev/null
+echo "deb [signed-by=/etc/apt/keyrings/pkgr-zammad.gpg] https://dl.packager.io/srv/deb/zammad/zammad/stable/debian 12 main" | sudo tee /etc/apt/sources.list.d/zammad.list >/dev/null
 $STD apt-get update
 $STD apt-get -y install zammad
 $STD zammad run rails r "Setting.set('es_url', 'http://localhost:9200')"
@@ -56,4 +58,4 @@ customize
 msg_info "Cleaning up"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
-msg_ok "Cleaned"
+msg_ok "Cleaned"