Fixed template

- Добавлены изменения в доку от hestiacn

CHANGELOG.md

@@ -63,7 +63,7 @@ All notable changes to this project will be documented in this file.
 ## [1.8.1] - Service release
 
 - Fixed Debian 10 not working with IP addresses check
-- Fixed Exim4 update config via patch was unreliable added few safety checks and add notice if failed.
+- Fixed Exim update config via patch was unreliable added few safety checks and add notice if failed.
 - Fixed hestia-nginx not loading with custom port
 
 ## [1.8.0] - Feature / Major release
@@ -630,8 +630,8 @@ A bug in v-update-sys-hestia caused auto update to be not working. Please run: `
 
 ## [1.6.2] - Service release
 
-- Fixed an issue with rate limits in Exim4 and make it more bullet proof (#2703)
+- Fixed an issue with rate limits in Exim and make it more bullet proof (#2703)
-- Fixed an issue with system-filter not properly loaded in Exim4 for Exim 4.94 and Ugrades from 1.5.x
+- Fixed an issue with system-filter not properly loaded in Exim for Exim 4.94 and Ugrades from 1.5.x
 
 ## [1.6.1] - Service release
 
@@ -1238,7 +1238,7 @@ After that run apt update && apt upgrade
 - Improve the calculated disk size of a new backup estimated by excluding the exclude folders, mail accounts and database in backups (#1616) @Myself5
 - Improve v-update-firewall / v-stop-firewall to make it self healing (#1892) @myrevery
 - Update phpMyAdmin version to 1.5.1 (See <https://www.phpmyadmin.net/news/2021/6/4/phpmyadmin-511-released/>)
-- Fixed a bug after rebuilding mail with Exim4 and suspended domains (#1886)
+- Fixed a bug after rebuilding mail with Exim and suspended domains (#1886)
 - Fixed "Allowed IP addresses for API" field with strange behaviour #1866
 - Fixed an issue where the "Saved confirmation" was not set due to a redirect #1879
 - Increased minimal memory requirements for ClamD / ClamAV. #1840

bin/v-add-mail-account

@@ -122,7 +122,7 @@ if [ -n "$user_rate_limit" ]; then
 	sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 	echo "$account@$domain_idn:$user_rate_limit" >> $HOMEDIR/$user/conf/mail/$domain/limits
 else
-	system=$(cat /etc/exim4/limit.conf)
+	system=$(cat /etc/exim/limit.conf)
 	sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 	echo "$account@$domain_idn:$system" >> $HOMEDIR/$user/conf/mail/$domain/limits
 fi

bin/v-add-mail-account-autoreply

@@ -28,11 +28,8 @@ source $HESTIA/func/domain.sh
 source_conf "$HESTIA/conf/hestia.conf"
 
 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+MAIL_USER=exim
-	MAIL_USER=Debian-exim
+
-else
-	MAIL_USER=exim
-fi
 
 # Additional argument formatting
 format_domain

bin/v-add-mail-account-fwd-only

@@ -27,11 +27,8 @@ source $HESTIA/func/domain.sh
 source_conf "$HESTIA/conf/hestia.conf"
 
 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+MAIL_USER=exim
-	MAIL_USER=Debian-exim
+
-else
-	MAIL_USER=exim
-fi
 
 # Additional argument formatting
 format_domain

bin/v-add-mail-domain

@@ -35,11 +35,7 @@ source $HESTIA/func/syshealth.sh
 source_conf "$HESTIA/conf/hestia.conf"
 
 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+MAIL_USER=exim
-	MAIL_USER=Debian-exim
-else
-	MAIL_USER=exim
-fi
 
 # Additional argument formatting
 format_domain

bin/v-add-mail-domain-dkim

@@ -27,11 +27,8 @@ source $HESTIA/func/domain.sh
 source_conf "$HESTIA/conf/hestia.conf"
 
 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+MAIL_USER=exim
-	MAIL_USER=Debian-exim
+
-else
-	MAIL_USER=exim
-fi
 
 # Additional argument formatting
 format_domain

bin/v-add-mail-domain-smtp-relay

@@ -48,7 +48,7 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
-cat > /etc/exim4/domains/${domain}/smtp_relay.conf << EOL
+cat > /etc/exim/domains/${domain}/smtp_relay.conf << EOL
 host:$host
 port:$port
 user:$username

bin/v-add-sys-smtp-relay

@@ -46,7 +46,7 @@ change_sys_value 'SMTP_RELAY_HOST' "$host"
 change_sys_value 'SMTP_RELAY_PORT' "$port"
 change_sys_value 'SMTP_RELAY_USER' "$username"
 
-cat > /etc/exim4/smtp_relay.conf << EOL
+cat > /etc/exim/smtp_relay.conf << EOL
 host:$host
 port:$port
 user:$username

bin/v-change-domain-owner

@@ -229,7 +229,7 @@ if [ -n "$mail_data" ]; then
 		echo "  ssl_key = <$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key" >> /etc/dovecot/conf.d/domains/$domain.conf
 		echo "}" >> /etc/dovecot/conf.d/domains/$domain.conf
 
-		# Add domain SSL configuration to exim4
+		# Add domain SSL configuration to exim
 		# Cleanup symlinks
 		find /usr/local/hestia/ssl/mail -xtype l -delete
 

bin/v-change-mail-account-rate-limit

@@ -66,7 +66,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 			sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 			echo "$account@$domain_idn:$user_rate_limit" >> $HOMEDIR/$user/conf/mail/$domain/limits
 		else
-			system=$(cat /etc/exim4/limit.conf)
+			system=$(cat /etc/exim/limit.conf)
 			sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 			echo "$account@$domain_idn:$system" >> $HOMEDIR/$user/conf/mail/$domain/limits
 		fi

bin/v-change-sys-service-config

@@ -69,7 +69,7 @@ case $service in
 	httpd) dst='/etc/httpd/conf/httpd.conf' ;;
 	apache2) dst='/etc/apache2/apache2.conf' ;;
 	exim) dst='/etc/exim/exim.conf' ;;
-	exim4) dst='/etc/exim4/exim4.conf.template' ;;
+	exim4) dst='/etc/exim/exim.conf.template' ;;
 	vsftpd) dst=$(find /etc/vsftpd* -name 'vsftpd.conf') ;;
 	proftpd) dst=$(find /etc/proftpd* -name 'proftpd.conf') ;;
 	php)

bin/v-delete-mail-domain-smtp-relay

@@ -37,7 +37,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 #                       Action                             #
 #----------------------------------------------------------#
 
-rm -f /etc/exim4/domains/${domain}/smtp_relay.conf
+rm -f /etc/exim/domains/${domain}/smtp_relay.conf
 
 #----------------------------------------------------------#
 #                       Hestia                             #

bin/v-delete-sys-smtp-relay

@@ -34,7 +34,7 @@ change_sys_value "SMTP_RELAY_HOST" ""
 change_sys_value "SMTP_RELAY_PORT" ""
 change_sys_value "SMTP_RELAY_USER" ""
 
-rm -f /etc/exim4/smtp_relay.conf
+rm -f /etc/exim/smtp_relay.conf
 
 #----------------------------------------------------------#
 #                       Hestia                             #

bin/v-list-sys-mail-status

@@ -39,14 +39,10 @@ echo -en "\n---------------------------------------------"
 echo -en "---------------------------------------------\n\n"
 
 # Displaying exim stats
-if [ -e "/var/log/exim4/mainlog" ]; then
+eximstats /var/log/exim/main.log 2> /dev/null
-	eximstats /var/log/exim4/mainlog 2> /dev/null
-else
-	eximstats /var/log/exim/main.log 2> /dev/null
-fi
 
 if [ $? -ne 0 ]; then
-	echo "[Exim4] No valid log lines read"
+	echo "[Exim] No valid log lines read"
 	exit 0
 fi
 

bin/v-rebuild-mail-domain

@@ -32,11 +32,8 @@ source $HESTIA/func/syshealth.sh
 source_conf "$HESTIA/conf/hestia.conf"
 
 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+export MAIL_USER="exim"
-	export MAIL_USER="Debian-exim"
+
-else
-	export MAIL_USER="exim"
-fi
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-rebuild-mail-domains

@@ -30,11 +30,8 @@ source $HESTIA/func/syshealth.sh
 source_conf "$HESTIA/conf/hestia.conf"
 
 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+export MAIL_USER="exim"
-	export MAIL_USER="Debian-exim"
+
-else
-	export MAIL_USER="exim"
-fi
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-restart-service

@@ -77,7 +77,7 @@ for service in $service_list; do
 	elif [ -z "$restart" -o "$restart" = "no" ] && [ \
 		"$service" = "nginx" -o \
 		"$service" = "httpd" -o \
-		"$service" = "exim4" -o \
+		"$service" = "exim" -o \
 		"$service" = "dovecot" -o \
 		"$service" = "bind9" -o \
 		"$service" = "named" -o \

bin/v-restore-user

@@ -643,7 +643,7 @@ if [ "$mail" != 'no' ] && [ -n "$MAIL_SYSTEM" ]; then
 				mkdir /usr/local/hestia/ssl/mail
 			fi
 
-			# Add domain SSL configuration to exim4
+			# Add domain SSL configuration to exim
 			# Cleanup broken symlinks
 			find /usr/local/hestia/ssl/mail -xtype l -delete
 

docs/.vitepress/config.js

@@ -47,6 +47,35 @@ export default defineConfig({
       copyright:
         "Copyright © 2019-present Hestia Control Panel и некоторые RPM based компоненты принадлежат bayrepo",
     },
+
+    search: {
+      provider: "local",
+      options: {
+        placeholder: "Поиск по документации",
+        minMatchCharLength: 1,
+        threshold: 0.2,
+        distance: 5000,
+        keys: ["title", "content", "headers"],
+        tokenize: (text) => {
+          const tokens = [];
+          const chineseChars = text.match(/[\u4e00-\u9fa5]/g) || [];
+          const englishWords = text.match(/[a-zA-Z0-9]+/g) || [];
+          return [...chineseChars, ...englishWords];
+        },
+        translations: {
+          button: { buttonText: "Поиск по документации" },
+          modal: {
+            noResultsText: "Ничего не найдено",
+            resetButtonTitle: "Сбросить поиск",
+            footer: {
+              selectText: "выбрать",
+              navigateText: "переключить",
+              closeText: "закрыть",
+            },
+          },
+        },
+      },
+    },
   },
 });
 
@@ -60,6 +89,7 @@ function nav() {
       link: "/docs/introduction/getting-started.md",
       activeMatch: "/docs/",
     },
+    { text: "Разработчики", link: "/team.md" },
     {
       text: `v${version}`,
       items: [

docs/.vitepress/theme/components/CopyToClipboardInput.vue

@@ -0,0 +1,125 @@
+<template>
+	<div class="CopyToClipboardInput" v-bind="$attrs">
+		<input
+			type="text"
+			class="CopyToClipboardInput-input"
+			:value="value"
+			@focus="selectText"
+			readonly
+		/>
+		<button
+			type="button"
+			class="CopyToClipboardInput-button"
+			@click="copyToClipboard"
+			title="Copy to clipboard"
+		>
+			Copy
+		</button>
+	</div>
+</template>
+
+<script setup>
+import { ref } from "vue";
+
+defineProps({
+	value: {
+		type: String,
+		required: true,
+	},
+});
+
+const selectText = (event) => {
+	if (window.innerWidth > 768) {
+		const inputElement = event.target;
+		inputElement.select();
+	}
+};
+
+const copyToClipboard = async (event) => {
+	const button = event.currentTarget;
+	const inputValue = button.previousElementSibling.value;
+
+	try {
+		const copyMethod = navigator.clipboard
+			? () => navigator.clipboard.writeText(inputValue)
+			: () => {
+					const textarea = document.createElement("textarea");
+					textarea.value = inputValue;
+					document.body.appendChild(textarea);
+					textarea.select();
+					document.execCommand("copy");
+					document.body.removeChild(textarea);
+			  };
+
+		await copyMethod();
+		if (navigator.vibrate) navigator.vibrate(50);
+		button.style.transform = "scale(0.95)";
+		button.textContent = "Copied!";
+
+		setTimeout(() => {
+			button.style.transform = "";
+			button.textContent = "Copy";
+		}, 1000);
+	} catch (err) {
+		button.textContent = "Copy failed";
+		console.error("Failed to copy:", err);
+		setTimeout(() => {
+			button.textContent = "Copy";
+		}, 1000);
+	}
+};
+</script>
+
+<style scoped>
+.CopyToClipboardInput {
+	display: flex;
+	gap: 10px;
+}
+
+.CopyToClipboardInput-input {
+	font-size: 0.9em;
+	font-family: monospace;
+	flex-grow: 1;
+	border: 1px solid var(--vp-c-border);
+	border-top-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	background-color: var(--vp-c-bg);
+	padding: 8px 13px;
+
+	&:focus {
+		border-color: var(--vp-button-brand-bg);
+	}
+	@media (max-width: 640px) {
+		font-size: 16px;
+		-webkit-tap-highlight-color: transparent;
+	}
+}
+
+.CopyToClipboardInput-button {
+	font-size: 14px;
+	border-radius: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	color: var(--vp-button-brand-text);
+	min-width: 73px;
+	font-weight: 600;
+	padding: 5px 10px;
+	background-color: var(--vp-button-brand-bg);
+	transition: all 0.2s ease;
+	user-select: none;
+
+	&:hover {
+		background-color: var(--vp-button-brand-hover-bg);
+	}
+	@media (max-width: 640px) {
+		min-width: 68px;
+		padding: 8px 12px;
+		-webkit-tap-highlight-color: transparent;
+		touch-action: manipulation;
+
+		&:active {
+			transform: scale(0.96);
+		}
+	}
+}
+</style>

docs/.vitepress/theme/components/InstallOptions.vue

@@ -1,204 +1,250 @@
-<script>
-export default {
-	props: {
-		languages: {
-			required: true,
-			selected: "en",
-		},
-		items: {
-			required: true,
-		},
-	},
-	data() {
-		return {
-			pageloader: false,
-			hestia_wget:
-				"wget https://raw.githubusercontent.com/bayrepo/hestiacp-rpm/refs/heads/rhel-version/install/hst-install.sh",
-			hestia_wget_devel:
-				"wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh",
-			hestia_install: "sudo bash hst-install.sh",
-			installStr: "",
-		};
-	},
-	methods: {
-		getOptionString(item) {
-			if (item.textField) {
-				return item.selected ? `${item.param} '${item.text}'` : "";
-			}
-
-			if (item.selectField) {
-				return item.selected ? `${item.param} '${item.text}'` : "";
-			}
-			return `${item.param}${item.selected ? " yes" : " no"}`;
-		},
-		generateString() {
-			const installStr = this.items.map(this.getOptionString).filter(Boolean);
-
-			this.installStr = `${this.hestia_install} ${installStr.join(" ")}`;
-			this.$refs.dialog.showModal();
-		},
-		closeDialog(e) {
-			if (e.target === this.$refs.dialogClose || e.target === this.$refs.dialog) {
-				this.$refs.dialog.close();
-			}
-		},
-		checkNeedEnabled(e) {
-			if (e.target.value != "") {
-				let id = e.target.getAttribute("target");
-				if (!document.getElementById(id).checked) {
-					document.getElementById(id).click();
-				}
-			}
-		},
-		toggleOption(e) {
-			if (e.target.checked) {
-				let conflicts = e.target.getAttribute("conflicts");
-				if (conflicts) {
-					if (document.getElementById(conflicts).checked) {
-						document.getElementById(conflicts).click();
-					}
-				}
-				let depends = e.target.getAttribute("depends");
-				if (depends) {
-					if (!document.getElementById(depends).checked) {
-						document.getElementById(depends).click();
-					}
-				}
-			}
-		},
-		copyToClipboard(text, button) {
-			navigator.clipboard.writeText(text).then(
-				() => {
-					button.textContent = "Copied!";
-					setTimeout(() => {
-						button.textContent = "Copy";
-					}, 1000);
-				},
-				(err) => {
-					console.error("Could not copy to clipboard:", err);
-				}
-			);
-		},
-	},
-};
-</script>
-
 <template>
-	<div class="container">
+	<div class="InstallOptions">
-		<div class="grid">
+		<div class="container">
-			<div class="form-group" v-for="item in items">
+			<div class="output-card">
-				<div class="form-check u-mb10">
+				<h1 class="u-text-center">Инструкция по установке для RHEL</h1>
-					<input
-						@change="toggleOption"
-						type="checkbox"
-						class="form-check-input"
-						v-model="item.selected"
-						:value="item.value"
-						:id="item.id"
-						:conflicts="item.conflicts"
-						:depends="item.depends"
-					/>
-					<label :for="item.id">{{ item.id }}</label>
-				</div>
-				<template v-if="item.textField || item.selectField">
-					<label class="form-label" :for="'input-' + item.id">{{ item.desc }}</label>
-				</template>
-				<template v-else>
-					<p>{{ item.desc }}</p>
-				</template>
-				<div v-if="item.textField">
-					<input
-						@change="checkNeedEnabled"
-						type="text"
-						class="form-control"
-						v-model="item.text"
-						:target="item.id"
-						:id="'input-' + item.id"
-						:type="'+item.type+'"
-					/>
-				</div>
-				<div v-if="item.selectField">
-					<select class="form-select" v-model="item.text" :id="'input-' + item.id">
-						<option v-for="language in languages" :value="language.value" :key="language.value">
-							{{ language.text }}
-						</option>
-					</select>
-				</div>
-			</div>
-		</div>
-		<div class="u-text-center u-mb10">
-			<button @click="generateString" class="form-submit" type="button">Submit</button>
-		</div>
-		<dialog ref="dialog" class="modal" @click="closeDialog">
-			<button class="modal-close" @click="closeDialog" type="button" ref="dialogClose">
-				Close
-			</button>
-			<div ref="dialogContent" class="modal-content">
-				<h1 class="modal-heading">Installation instructions</h1>
 				<p class="u-mb10">
-					Log in to your server as root, either directly or via SSH:
+					Войдите на свой сервер как root, напрямую или через SSH: ssh root@ваш.сервер, и загрузите
-					<code>ssh root@your.server</code> and download the installation script:
+					установочный скрипт:
 				</p>
-				<div class="u-pos-relative">
+				<CopyToClipboardInput
-					<input
+					class="u-mb10"
-						type="text"
+					value="wget https://raw.githubusercontent.com/bayrepo/hestiacp-rpm/refs/heads/rhel-version/install/hst-install.sh"
-						class="form-control u-monospace u-mb10"
+					style="font-size: 1.2em"
-						v-model="hestia_wget"
+				/>
-						readonly
+				<p class="u-mb10">Для загрузки разработочной версии используйте:</p>
-					/>
+				<CopyToClipboardInput
-					<button
+					class="u-mb10"
-						class="button-positioned"
+					value="wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh"
-						@click="copyToClipboard(hestia_wget, $event.target)"
+					style="font-size: 1.2em"
-						type="button"
+				/>
-						title="Copy to Clipboard"
+				<p class="u-mb10">
-					>
+					Убедитесь, что вы вошли на сервер как <code>root</code>. Настройте параметры в полях ниже,
-						Copy
+					затем скопируйте и выполните готовую команду в терминале сервера:
-					</button>
+				</p>
-				</div>
+				<CopyToClipboardInput class="u-mb10" :value="installCommand" style="font-size: 1.2em" />
-				<p class="u-mb10">For downloading devel version use:</p>
-				<div class="u-pos-relative">
-					<input
-						type="text"
-						class="form-control u-monospace u-mb10"
-						v-model="hestia_wget_devel"
-						readonly
-					/>
-					<button
-						class="button-positioned"
-						@click="copyToClipboard(hestia_wget_devel, $event.target)"
-						type="button"
-						title="Copy to Clipboard"
-					>
-						Copy
-					</button>
-				</div>
-				<p class="u-mb10">Then run the following command:</p>
-				<div class="u-pos-relative">
-					<textarea class="form-control u-min-height100" v-model="installStr" readonly />
-					<button
-						class="button-positioned"
-						@click="copyToClipboard(installStr, $event.target)"
-						type="button"
-						title="Copy to Clipboard"
-					>
-						Copy
-					</button>
-				</div>
 			</div>
-		</dialog>
+			<h2 class="u-text-center">Настройка компонентов: выберите необходимые для установки</h2>
+			<h3 class="u-text-center">
+				<i class="fa-solid fa-triangle-exclamation"></i> Примечание: Рекомендуется выполнить полную
+				настройку здесь, иначе вам придётся вводить данные в терминале! (Пункты 1.2.3.4.5
+				обязательны)
+			</h3>
+			<ul class="option-list">
+				<li
+					v-for="option in options"
+					:key="option.flag"
+					:class="{
+						'option-item': true,
+						'is-active': selectedOptions[option.flag].enabled,
+						'is-clickable': !option.type || !selectedOptions[option.flag].enabled,
+					}"
+				>
+					<div class="option-header">
+						<div class="form-check">
+							<input
+								type="checkbox"
+								class="form-check-input"
+								:id="option.flag"
+								v-model="selectedOptions[option.flag].enabled"
+								:conflicts="option.conflicts"
+								:depends="option.depends"
+								@change="toggleOption"
+							/>
+							<label :for="option.flag" @click.stop>{{ option.label }}</label>
+						</div>
+					</div>
+					<div class="option-description" v-html="option.description"></div>
+					<div v-if="option.type === 'text'" class="option-content">
+						<input
+							class="form-control"
+							type="text"
+							:id="`${option.flag}-input`"
+							v-model="selectedOptions[option.flag].value"
+							:placeholder="option.default"
+							@input="checkNeedEnabled(option.flag, $event)"
+						/>
+					</div>
+					<div v-if="option.type === 'select'" class="option-content">
+						<select
+							class="form-select"
+							:id="`${option.flag}-input`"
+							v-model="selectedOptions[option.flag].value"
+							@change="checkNeedEnabled(option.flag, $event)"
+						>
+							<option v-for="opt in option.options" :key="opt.value" :value="opt.value">
+								{{ opt.label }}
+							</option>
+						</select>
+					</div>
+				</li>
+			</ul>
+		</div>
 	</div>
 </template>
 
+<script setup>
+import { ref, watchEffect } from "vue";
+import CopyToClipboardInput from "./CopyToClipboardInput.vue";
+
+const { options } = defineProps({
+	options: {
+		type: Array,
+		required: true,
+		default: () => [],
+	},
+});
+
+const selectedOptions = ref({});
+options.forEach((option) => {
+	const isPortOrLang = ["port", "lang"].includes(option.flag);
+	selectedOptions.value[option.flag] = {
+		enabled: isPortOrLang || option.default === "yes",
+		value: option.default !== "yes" && option.default !== "no" ? option.default : null,
+	};
+});
+
+const checkNeedEnabled = (flag, event) => {
+	if (event.target.value !== "" && event.target.value !== null) {
+		if (!selectedOptions.value[flag].enabled) {
+			selectedOptions.value[flag].enabled = true;
+		}
+	}
+};
+
+const toggleOption = (event) => {
+	const checkbox = event.target;
+	const flag = checkbox.id;
+	const conflicts = checkbox.getAttribute("conflicts");
+	const depends = checkbox.getAttribute("depends");
+
+	if (checkbox.checked) {
+		if (conflicts) {
+			const conflictFlag = conflicts;
+			if (selectedOptions.value[conflictFlag]?.enabled) {
+				selectedOptions.value[conflictFlag].enabled = false;
+			}
+		}
+		if (depends) {
+			const dependFlag = depends;
+			if (!selectedOptions.value[dependFlag]?.enabled) {
+				selectedOptions.value[dependFlag].enabled = true;
+			}
+		}
+	}
+};
+
+const installCommand = ref("bash hst-install.sh");
+watchEffect(() => {
+	let cmd = "sudo bash hst-install.sh";
+	const quoteshellarg = (str) => {
+		if (!str) return "''";
+		return `'${str.replace(/'/g, "'\\''")}'`;
+	};
+	for (const [key, { enabled, value }] of Object.entries(selectedOptions.value)) {
+		const opt = options.find((o) => o.flag === key);
+		if (!opt.type || opt.type === "checkbox") {
+			if (enabled !== (opt.default === "yes")) {
+				cmd += ` --${key} ${enabled ? "yes" : "no"}`;
+			}
+		} else if (enabled && value !== opt.default) {
+			const value_quoted = quoteshellarg(value);
+			cmd += ` --${key} ${value_quoted}`;
+		}
+	}
+	installCommand.value = cmd;
+});
+</script>
+
 <style scoped>
+.InstallOptions {
+	padding: 0 24px;
+
+	@media (min-width: 640px) {
+		padding: 0 48px;
+	}
+
+	@media (min-width: 960px) {
+		padding: 0 72px;
+	}
+}
+:root {
+	--text-color-light: #282828;
+	--text-color-dark: #f0f0f0;
+}
+h1 {
+	font-size: 32px;
+	font-weight: bold;
+	text-align: center;
+	margin-bottom: 30px;
+	color: var(--text-color-light);
+}
+h2 {
+	font-size: 24px;
+	font-weight: 600;
+	margin-bottom: 25px;
+	color: var(--text-color-light);
+}
+
+h3 {
+	font-size: 20px;
+	font-weight: 500;
+	margin-bottom: 20px;
+	color: #b7236a;
+	font-weight: bold;
+}
+@media (max-width: 640px) {
+	h1 {
+		font-size: 20px;
+	}
+	h2 {
+		font-size: 18px;
+	}
+	h3 {
+		font-size: 16px;
+	}
+}
+p {
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 1.6;
+	margin-bottom: 15px;
+	color: var(--text-color-light);
+}
+a {
+	color: var(--vp-button-brand-active-bg);
+	text-decoration: none;
+}
+a:visited {
+	color: var(--vp-button-brand-active-bg);
+}
+a:hover {
+	color: var(--vp-button-brand-hover-bg);
+}
+a:active {
+	color: var(--vp-button-brand-hover-bg);
+}
 .container {
-	margin: 0px auto;
+	display: flex;
+	flex-direction: column;
+	margin: 0 auto;
 	max-width: 1152px;
 }
-.grid {
+.output-card {
+	background-color: var(--vp-c-bg-alt);
+	border-radius: 10px;
+	padding: 30px;
+	margin-top: 40px;
+	margin-bottom: 40px;
+
+	@media (min-width: 640px) {
+		padding: 30px 50px;
+	}
+}
+.option-list {
 	display: grid;
-	grid-gap: 20px;
+	grid-gap: 23px;
-	margin-top: 30px;
+	margin-bottom: 50px;
-	margin-bottom: 30px;
 
 	@media (min-width: 640px) {
 		grid-template-columns: 1fr 1fr;
@@ -208,17 +254,87 @@ export default {
 		grid-template-columns: 1fr 1fr 1fr;
 	}
 }
-.form-group {
+.option-item {
 	font-size: 0.9em;
 	border-radius: 10px;
-	padding: 15px 20px;
+	border: 2px solid transparent;
+	padding: 10px 20px;
 	background-color: var(--vp-c-bg-alt);
+	transition: border-color 0.2s;
+
+	&:hover {
+		border-color: var(--vp-button-brand-hover-bg);
+	}
+
+	&.is-active {
+		border-color: var(--vp-button-brand-active-bg);
+	}
+}
+.option-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 8px;
+}
+.option-icon {
+	padding: 5px;
+	margin-right: -5px;
+
+	& i {
+		opacity: 0.7;
+	}
+
+	&:hover i {
+		opacity: 1;
+	}
+}
+.option-description {
+	font-size: 13px;
+	line-height: 1.5;
+	margin-bottom: 10px;
+	padding-bottom: 8px;
+}
+.option-description pre {
+	background-color: var(--vp-c-bg, #f5f5f5);
+	border: 1px solid var(--vp-c-border, #e0e0e0);
+	border-radius: 8px;
+	padding: 12px 16px;
+	overflow-x: auto;
+	margin: 12px 0;
+	font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", monospace;
+	font-size: 13px;
+	line-height: 1.5;
+}
+.option-description code {
+	font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", monospace;
+	font-size: 13px;
+	background-color: var(--vp-c-bg, #f0f0f0);
+	padding: 2px 6px;
+	border-radius: 4px;
+}
+.option-description pre code {
+	background-color: transparent;
+	padding: 0;
+	font-size: 13px;
+}
+@media (prefers-color-scheme: dark) {
+	.option-description pre {
+		background-color: #2d2d2d;
+		border-color: #444;
+	}
+	.option-description code {
+		background-color: #2d2d2d;
+	}
+}
+.option-content {
+	margin-top: 5px;
+	margin-bottom: 5px;
 }
 .form-label {
 	display: inline-block;
-	margin-left: 2px;
+	font-size: 16px;
+	line-height: 1.5;
 	padding-bottom: 5px;
-	text-transform: capitalize;
 }
 .form-control {
 	font-size: 0.9em;
@@ -242,7 +358,7 @@ export default {
 	border: 1px solid var(--vp-c-border);
 	border-radius: 4px;
 	background-color: var(--vp-c-bg);
-	padding: 5px 10px;
+	padding: 6px;
 	width: 100%;
 
 	&:hover {
@@ -254,100 +370,36 @@ export default {
 	}
 }
 .form-check {
+	flex-grow: 1;
 	position: relative;
-	padding-left: 20px;
+	padding-left: 25px;
-	margin-left: 3px;
-	min-height: 24px;
 
 	& label {
+		font-size: 16px;
 		font-weight: 600;
+		display: block;
+		line-height: 1.6;
+
+		&:hover {
+			cursor: pointer;
+		}
 	}
 }
 .form-check-input {
+	cursor: pointer;
 	position: absolute;
+	width: 15px;
+	height: 15px;
 	margin-top: 5px;
-	margin-left: -20px;
+	margin-left: -25px;
-}
-.form-submit {
-	border: 1px solid transparent;
-	display: inline-block;
-	font-weight: 600;
-	transition: color 0.25s, border-color 0.25s, background-color 0.25s;
-	border-radius: 20px;
-	font-size: 16px;
-	padding: 10px 20px;
-	background-color: var(--vp-button-brand-bg);
-	border-color: var(--vp-button-brand-border);
-	color: var(--vp-button-brand-text);
-
-	&:hover {
-		background-color: var(--vp-button-brand-hover-bg);
-		border-color: var(--vp-button-brand-hover-border);
-		color: var(--vp-button-brand-hover-text);
-	}
-
-	&:active {
-		background-color: var(--vp-button-brand-active-bg);
-		border-color: var(--vp-button-brand-active-border);
-		color: var(--vp-button-brand-active-text);
-	}
-}
-.button-positioned {
-	position: absolute;
-	right: 1px;
-	top: 1px;
-	border-top-right-radius: 3px;
-	border-bottom-right-radius: 3px;
-	color: var(--vp-c-brand);
-	font-weight: 600;
-	padding: 6px 10px;
-	background-color: var(--vp-c-bg);
-}
-.modal {
-	position: fixed;
-	border-radius: 10px;
-	border: 1px solid var(--vp-c-border);
-	box-shadow: 0 8px 40px 0 rgb(0 0 0 / 35%);
-	padding: 0;
-
-	&::backdrop {
-		background-color: rgb(0 0 0 / 50%);
-	}
-}
-.modal-close {
-	position: absolute;
-	top: 10px;
-	right: 15px;
-	font-weight: 600;
-	color: var(--vp-c-brand);
-}
-.modal-content {
-	padding: 30px;
-}
-.modal-heading {
-	font-weight: 600;
-	font-size: 1.3em;
-	text-align: center;
-	margin-bottom: 15px;
-}
-code {
-	background-color: var(--vp-c-bg-alt);
-	border-radius: 3px;
-	padding: 2px 5px;
 }
 .u-mb10 {
 	margin-bottom: 10px !important;
 }
-.u-min-height100 {
-	min-height: 100px;
-}
 .u-text-center {
 	text-align: center !important;
 }
-.u-monospace {
+.is-clickable {
-	font-family: monospace !important;
+	cursor: pointer;
-}
-.u-pos-relative {
-	position: relative !important;
 }
 </style>

docs/.vitepress/theme/components/InstallOptionsSection.vue

@@ -1,29 +0,0 @@
-<template>
-	<form class="InstallForm" id="form">
-		<div class="InstallOptionsSection">
-			<slot name="list" />
-		</div>
-		<cite
-			>Based on: <a href="https://github.com/gabizz/hestiacp-scriptline-generator">@gabizz</a> and
-			<a href="https://github.com/turbopixel/HestiaCP-Command-Creator">@turbopixel</a></cite
-		>
-	</form>
-</template>
-
-<style scoped>
-.InstallForm {
-	margin: 0.55em 0;
-	padding: 0 1em;
-	line-height: 1.5;
-}
-cite {
-	font-size: small;
-	margin: 0.55em 0;
-	display: block;
-	text-align: center;
-
-	& a {
-		color: var(--vp-c-txt-1) !important;
-	}
-}
-</style>

docs/.vitepress/theme/components/InstallPage.vue

@@ -6,23 +6,6 @@
 
 <style scoped>
 .InstallPage {
-	line-height: 1.5;
+	line-height: 1;
-}
-.InstallPage :deep(.container) {
-	display: flex;
-	flex-direction: column;
-	margin: 0 auto;
-	max-width: 1152px;
-}
-
-.InstallPage :deep(a) {
-	font-weight: 500;
-	color: var(--vp-c-brand);
-	text-decoration-style: dotted;
-	transition: color 0.25s;
-}
-
-.InstallPage :deep(a:hover) {
-	color: var(--vp-c-brand-dark);
 }
 </style>

docs/.vitepress/theme/components/InstallPageTitle.vue

@@ -1,42 +0,0 @@
-<template>
-	<header class="InstallPageTitle">
-		<div class="container">
-			<h1>
-				<slot name="title"></slot>
-			</h1>
-			<p v-if="$slots.lead" class="lead">
-				<slot name="lead" />
-			</p>
-		</div>
-	</header>
-</template>
-
-<style scoped>
-.InstallPageTitle {
-	padding: 0 24px;
-	background-color: var(--vp-c-bg-alt);
-}
-
-.InstallPageTitle h1 {
-	margin: 0.75em 0;
-	font-size: 2rem;
-	font-weight: 700;
-	line-height: inherit;
-}
-
-@media (min-width: 640px) {
-	.InstallPageTitle {
-		padding: 0 48px;
-	}
-
-	.InstallPageTitle h1 {
-		font-size: 2.5rem;
-	}
-}
-
-@media (min-width: 960px) {
-	.InstallPageTitle {
-		padding: 0 64px;
-	}
-}
-</style>

docs/.vitepress/theme/components/PageHeader.vue

@@ -0,0 +1,82 @@
+<template>
+	<header class="PageHeader">
+		<div class="container">
+			<h1>
+				<slot name="title"></slot>
+			</h1>
+			<h2 class="subtitle">
+				<slot name="subtitle"></slot>
+			</h2>
+			<div v-if="$slots.aside" class="aside-container">
+				<slot name="aside"></slot>
+			</div>
+		</div>
+	</header>
+</template>
+
+<style scoped>
+:root {
+	--text-color-light: #282828;
+	--text-color-dark: var(--el-color-primary-light-9);
+}
+
+.container {
+	display: flex;
+	margin: 0 auto;
+	text-align: center;
+	align-items: center;
+	justify-content: center;
+	max-width: 1260px;
+	color: var(--text-color-light);
+}
+
+.aside-container {
+	display: flex;
+	margin-left: auto;
+	margin-bottom: 15px;
+}
+
+.subtitle {
+	margin: -0.5em 0 1.2em 0;
+	font-size: 1.2rem;
+	font-weight: 700;
+	line-height: 1.6;
+	color: inherit;
+	text-align: center;
+	max-width: 800px;
+}
+
+.subtitle :deep(a) {
+	color: var(--vp-c-brand);
+	text-decoration: none;
+	transition: color 0.3s;
+}
+
+.subtitle :deep(a):hover {
+	color: #d8036a;
+}
+
+.PageHeader {
+	padding: 0 24px;
+	background-color: var(--vp-c-bg-alt);
+
+	h1 {
+		margin: 0.75em 0;
+		font-size: 2rem;
+		font-weight: 700;
+		line-height: inherit;
+
+		@media (max-width: 640px) {
+			font-size: 20px;
+		}
+	}
+
+	@media (min-width: 640px) {
+		padding: 0 48px;
+	}
+
+	@media (min-width: 960px) {
+		padding: 0 64px;
+	}
+}
+</style>

docs/.vitepress/theme/index.js

@@ -6,11 +6,12 @@ import './styles/base.css';
 import './styles/vars.css';
 import FeaturePage from './components/FeaturePage.vue';
 import InstallPage from './components/InstallPage.vue';
-
+import PageHeader from './components/PageHeader.vue';
 export default {
 	...Theme,
 	enhanceApp({ app }) {
 		app.component('FeaturePage', FeaturePage);
 		app.component('InstallPage', InstallPage);
+		app.component('PageHeader', PageHeader);
 	},
 };

docs/.vitepress/theme/styles/vars.css

@@ -2,10 +2,14 @@
 	--vp-c-brand-lighter: #ff558f;
 	--vp-c-brand-light: #da4778;
 	--vp-c-brand: #b7236a;
-	--vp-c-brand-dark: #9a1d5a;
+	--vp-c-brand-dark: #e2237f;
-	--vp-c-brand-darker: #781746;
+	--vp-c-brand-darker: #c00b62;
 	--vp-home-hero-name-color: transparent;
 	--vp-home-hero-name-background: linear-gradient(120deg, #d83182, #633288, #41d1ff);
+	--vp-button-brand-bg: #b7236a;
+	--vp-button-brand-hover-bg: #d8036a;
+	--vp-button-brand-active-bg: #e7197d;
+	--vp-c-brand-1: #b7236a;
 }
 
 .dark {
@@ -15,4 +19,8 @@
 	--vp-c-brand: #ff558f;
 	--vp-c-brand-dark: #da4778;
 	--vp-c-brand-darker: #b7236a;
+	--vp-button-brand-bg: #da4778;
+	--vp-button-brand-hover-bg: #b7236a;
+	--vp-c-brand-1: #da4778;
+	--vp-code-block-bg: #282c34;
 }

docs/_data/languages.js

@@ -1,43 +0,0 @@
-export const languages = [
-	{ text: 'Arabic', value: 'ar' },
-	{ text: 'Armenian', value: 'hy' },
-	{ text: 'Azerbaijani', value: 'az' },
-	{ text: 'Bengali', value: 'bn' },
-	{ text: 'Bosnian', value: 'bs' },
-	{ text: 'Bulgarian', value: 'bg' },
-	{ text: 'Catalan', value: 'ca' },
-	{ text: 'Croatian', value: 'hr' },
-	{ text: 'Czech', value: 'cs' },
-	{ text: 'Danish', value: 'da' },
-	{ text: 'Dutch', value: 'nl' },
-	{ text: 'English', value: 'en' },
-	{ text: 'Finnish', value: 'fi' },
-	{ text: 'French', value: 'fr' },
-	{ text: 'Georgian', value: 'ka' },
-	{ text: 'German', value: 'de' },
-	{ text: 'Greek', value: 'el' },
-	{ text: 'Hungarian', value: 'hu' },
-	{ text: 'Indonesian', value: 'id' },
-	{ text: 'Italian', value: 'it' },
-	{ text: 'Japanese', value: 'ja' },
-	{ text: 'Korean', value: 'ko' },
-	{ text: 'Kurdish Sorani', value: 'ku' },
-	{ text: 'Norwegain', value: 'no' },
-	{ text: 'Persian', value: 'fa' },
-	{ text: 'Polish', value: 'pl' },
-	{ text: 'Portuguese', value: 'pt' },
-	{ text: 'Portuguese (Brasil)', value: 'pt-br' },
-	{ text: 'Romanian', value: 'ro' },
-	{ text: 'Russian', value: 'ru' },
-	{ text: 'Serbian', value: 'sr' },
-	{ text: 'Simplified Chinese (China)', value: 'zh-cn' },
-	{ text: 'Slovak', value: 'sk' },
-	{ text: 'Spanish', value: 'es' },
-	{ text: 'Swedish', value: 'sv' },
-	{ text: 'Thai', value: 'th' },
-	{ text: 'Traditional Chinese (Taiwan)', value: 'zh-tw' },
-	{ text: 'Turkish', value: 'tr' },
-	{ text: 'Ukrainian', value: 'uk' },
-	{ text: 'Urdu', value: 'ur' },
-	{ text: 'Vietnamese', value: 'vi' },
-];

docs/_data/options.js

@@ -1,207 +1,253 @@
 export const options = [
 	{
-		name: ' --port',
+		flag: 'port',
-		id: 'port',
+		label: 'Порт управления',
-		param: '--port',
+		description: 'Установите порт HTTPS панели Hestia. По умолчанию: 8083. Обязательный параметр!',
-		desc: 'Изменить порт Hestia',
+		type: 'text',
-		selected: true,
+		required: 'true',
-		text: '8083',
+		default: '8083',
-		textField: true,
 	},
 	{
-		name: ' --lang',
+		flag: 'lang',
-		id: 'language',
+		label: 'Язык интерфейса панели',
-		param: '--lang',
+		description:
-		desc: 'ISO 639-1 codes',
+			'Выберите язык веб-интерфейса. Если не выбирать, система будет использовать английский язык по умолчанию.',
-		selected: true,
+		type: 'select',
 		default: 'en',
-		selectField: true,
+		options: [
-		text: 'en',
+			{ label: 'Shqip (Albanian)', value: 'sq' },
+			{ label: 'العربية (Arabic)', value: 'ar' },
+			{ label: 'Հայերեն (Armenian)', value: 'hy' },
+			{ label: 'Azərbaycan (Azerbaijani)', value: 'az' },
+			{ label: 'বাংলা (Bengali)', value: 'bn' },
+			{ label: 'Bosanski (Bosnian)', value: 'bs' },
+			{ label: 'Български (Bulgarian)', value: 'bg' },
+			{ label: 'Català (Catalan)', value: 'ca' },
+			{ label: 'Hrvatski (Croatian)', value: 'hr' },
+			{ label: 'Čeština (Czech)', value: 'cs' },
+			{ label: 'Dansk (Danish)', value: 'da' },
+			{ label: 'Nederlands (Dutch)', value: 'nl' },
+			{ label: 'English', value: 'en' },
+			{ label: 'Suomi (Finnish)', value: 'fi' },
+			{ label: 'Français (French)', value: 'fr' },
+			{ label: 'ქართული (Georgian)', value: 'ka' },
+			{ label: 'Deutsch (German)', value: 'de' },
+			{ label: 'Ελληνικά (Greek)', value: 'el' },
+			{ label: 'Magyar (Hungarian)', value: 'hu' },
+			{ label: 'Bahasa Indonesia (Indonesian)', value: 'id' },
+			{ label: 'Italiano (Italian)', value: 'it' },
+			{ label: '日本語 (Japanese)', value: 'ja' },
+			{ label: '한국어 (Korean)', value: 'ko' },
+			{ label: 'Kurdî (Sorani Kurdish)', value: 'ku' },
+			{ label: 'Norsk (Norwegian)', value: 'no' },
+			{ label: 'فارسی (Persian)', value: 'fa' },
+			{ label: 'Polski (Polish)', value: 'pl' },
+			{ label: 'Português (Portuguese)', value: 'pt' },
+			{ label: 'Português do Brasil (Brazilian Portuguese)', value: 'pt-br' },
+			{ label: 'Română (Romanian)', value: 'ro' },
+			{ label: 'Русский (Russian)', value: 'ru' },
+			{ label: 'Српски (Serbian)', value: 'sr' },
+			{ label: '简体中文 (Chinese Simplified)', value: 'zh-cn' },
+			{ label: 'Slovenčina (Slovak)', value: 'sk' },
+			{ label: 'Español (Spanish)', value: 'es' },
+			{ label: 'Svenska (Swedish)', value: 'sv' },
+			{ label: 'ไทย (Thai)', value: 'th' },
+			{ label: '繁體中文 (Chinese Traditional)', value: 'zh-tw' },
+			{ label: 'Türkçe (Turkish)', value: 'tr' },
+			{ label: 'Українська (Ukrainian)', value: 'uk' },
+			{ label: 'اردو (Urdu)', value: 'ur' },
+			{ label: 'Tiếng Việt (Vietnamese)', value: 'vi' },
+		],
 	},
 	{
-		name: ' --hostname',
+		flag: 'hostname',
-		id: 'hostname',
+		label: 'Имя хоста сервера',
-		param: '--hostname',
+		description:
-		desc: 'Установить имя хоста',
+			'Укажите веб-имя хоста сервера. Следуйте формату: demo.example.com. Обязательный параметр!',
-		selected: false,
+		type: 'text',
-		text: '',
+		default: '',
-		textField: true,
 	},
 	{
-		name: ' --email',
+		flag: 'email',
-		id: 'email',
+		label: 'Электронная почта',
-		param: '--email',
+		description:
-		desc: 'Установить почту адмнистратора',
+			'Введите email администратора для уведомлений об异常 конфигурации сервера. Обязательный параметр!',
-		selected: false,
+		type: 'text',
-		text: '',
+		default: '',
-		textField: true,
 	},
 	{
-		name: ' --password',
+		flag: 'password',
-		id: 'password',
+		label: 'Пароль',
-		param: '--password',
+		description:
-		desc: 'Установить пароль администратора',
+			'Установите пароль для учетной записи администратора. Если не указать, будет сгенерирован случайный пароль.',
-		selected: false,
+		type: 'text',
-		text: '',
+		default: '',
-		textField: true,
 	},
 	{
-		name: ' --apache',
+		flag: 'nopublicip',
-		id: 'apache',
+		label: 'Принудительно использовать локальный IP',
-		param: '--apache',
+		description:
-		desc: 'Веб сервер с поддержкой .htaccess',
+			'Использовать внутренний/локальный IP-адрес сервера в качестве адреса привязки, не пытаться получить публичный IP. Подходит для внутренних сетей, NAT-сетей, локальной разработки и тестирования, где не требуется публичный доступ.',
-		selected: true,
+		default: 'no',
-	},
-	{ name: ' --phpfpm', id: 'phpfpm', param: '--phpfpm', desc: 'Установить PHP-FPM.', selected: true },
-	{
-		name: ' --multiphp',
-		id: 'multiphp',
-		param: '--multiphp',
-		desc: 'Разрешить использовать несколько PHP версий.',
-		selected: true,
 	},
 	{
-		name: ' --vsftpd',
+		flag: 'apache',
-		id: 'vsftpd',
+		label: 'Apache2',
-		param: '--vsftpd',
+		description:
-		desc: 'Легковесный, минималистичный и безопасный FTP сервер.',
+			'Apache2 — мощный, высококонфигурируемый и широко поддерживаемый веб-сервер с открытым исходным кодом. Используется для хостинга веб-сайтов, поддержки веб-приложений, балансировки нагрузки и кэширования.',
-		selected: true,
+		default: 'yes',
-		conflicts: 'proftpd',
 	},
 	{
-		name: ' --proftpd',
+		flag: 'phpfpm',
-		id: 'proftpd',
+		label: 'PHP-FPM',
-		param: '--proftpd',
+		description: 'PHP-FPM — это менеджер процессов FastCGI для выполнения PHP-скриптов.',
-		desc: 'Продвинутый, модульный FTP сервер с поддержкой LDAP.',
+		default: 'yes',
-		selected: false,
-		conflicts: 'vsftpd',
 	},
 	{
-		name: ' --named',
+		flag: 'multiphp',
-		id: 'named',
+		label: 'MultiPHP',
-		param: '--named',
+		description:
-		desc: 'Собственный DNS сервер.',
+			'При включении по умолчанию устанавливается PHP 8.2, а также появляется возможность установки нескольких версий PHP 7.4-8.5 в панели. При отключении устанавливается только стандартная версия PHP.',
-		selected: true,
+		default: 'yes',
 	},
 	{
-		name: ' --mysql',
+		flag: 'vsftpd',
-		id: 'mariadb',
+		label: 'VSFTPD',
-		param: '--mysql',
+		description:
-		desc: 'Ответление MySQL с дополнительными усовершенствованиями.',
+			'VSFTPD — это безопасный, быстрый и стабильный FTP-сервер. Особенно подходит для Linux-систем. Обеспечивает безопасную и быструю передачу файлов между сервером и пользователями.',
-		selected: true,
+		default: 'yes',
-		conflicts: 'mysql8',
 	},
 	{
-		name: ' --mysql-classic',
+		flag: 'proftpd',
-		id: 'mysql8',
+		label: 'ProFTPD',
-		param: '--mysql-classic',
+		description:
-		desc: 'База данных с открытым исходным кодом',
+			'ProFTPD — это продвинутый модульный FTP-сервер. Поддерживает аутентификацию и авторизацию пользователей через LDAP.',
-		selected: false,
+		default: 'no',
-		conflicts: 'mariadb',
 	},
 	{
-		name: ' --postgresql',
+		flag: 'named',
-		id: 'postgresql',
+		label: 'BIND',
-		param: '--postgresql',
+		description:
-		desc: 'База данных с открытым исходным кодом',
+			'BIND (Berkeley Internet Name Domain) — популярное DNS-программное обеспечение. Обязательный параметр для серверных кластеров, требующих настройки собственного DNS.',
-		selected: false,
+		default: 'yes',
 	},
 	{
-		name: ' --exim',
+		flag: 'mysql',
-		id: 'exim',
+		label: 'MariaDB',
-		param: '--exim',
+		description:
-		desc: 'Позволить отправлять почту по SMTP.',
+			'MariaDB — это ветка MySQL, предоставляющая функции, совместимые с MySQL, а также некоторые дополнительные возможности и улучшения.',
-		selected: true,
+		default: 'yes',
 	},
 	{
-		name: ' --dovecot',
+		flag: 'mysql-classic',
-		id: 'dovecot',
+		label: 'MySQL 8',
-		param: '--dovecot',
+		description:
-		desc: 'Принимать почту и отправлять по IMAP/POP3.',
+			'MySQL 8 предлагает простоту настройки, управления и масштабирования. Обеспечивает повышенную безопасность, высокую доступность в пределах одного региона или с резервированием и гарантирует 99.99% уровень обслуживания (SLA).',
-		selected: true,
+		default: 'no',
-		depends: 'exim',
 	},
 	{
-		name: ' --sieve',
+		flag: 'postgresql',
-		id: 'sieve',
+		label: 'PostgreSQL',
-		param: '--sieve',
+		description:
-		desc: 'Управлять собственными фильтрами почты.',
+			'PostgreSQL — мощная объектно-реляционная система управления базами данных с открытым исходным кодом. Широко используется в финансовых услугах, обрабатывающей промышленности, розничной торговле, логистике и многих других областях.',
-		selected: false,
+		default: 'no',
-		depends: 'dovecot',
 	},
 	{
-		name: ' --clamav',
+		flag: 'exim',
-		id: 'clamav',
+		label: 'Exim',
-		param: '--clamav',
+		description:
-		desc: 'Сканировать почту на вирусы.',
+			'Exim — это агент передачи сообщений (MTA), используемый для маршрутизации, доставки и приема сообщений электронной почты. Позволяет отправлять электронные письма через SMTP из сети или от локальных программ.',
-		selected: true,
+		default: 'yes',
-		depends: 'exim',
-	},	
-	{
-		name: ' --usemirrorclamav',
-		id: 'usemirrorclamav',
-		param: '--usemirrorclamav',
-		desc: 'Использовать русское зеркало баз данных ClamaV',
-		selected: false,
-		depends: 'clamav',
 	},
 	{
-		name: ' --spamassassin',
+		flag: 'dovecot',
-		id: 'spamassassin',
+		label: 'Dovecot',
-		param: '--spamassassin',
+		description:
-		desc: 'Фильтровать почту на спам.',
+			'Dovecot — это серверное программное обеспечение с открытым исходным кодом для IMAP и POP3. Обеспечивает почтовые услуги для Linux-систем. Известен своей безопасностью, простотой использования, скоростью и низким потреблением ресурсов.',
-		selected: true,
+		default: 'yes',
-		depends: 'exim',
 	},
 	{
-		name: ' --firewall',
+		flag: 'sieve',
-		id: 'firewall',
+		label: 'Правила Sieve',
-		param: '--firewall',
+		description:
-		desc: 'Управлять фаерволом.',
+			'Включает поддержку правил фильтрации почты (Sieve), позволяя пользователям настраивать автоматическую сортировку, обработку спама, автоматические ответы и другие правила. Требует Dovecot и Exim.',
-		selected: true,
+		default: 'no',
 	},
 	{
-		name: ' --nopublicip',
+		flag: 'clamav',
-		id: 'nopublicip',
+		label: 'ClamAV',
-		param: '--nopublicip',
+		description:
-		desc: 'Использовать локальный IP сервера',
+			'ClamAV — это кроссплатформенное программное обеспечение с открытым исходным кодом для обеспечения безопасности электронной почты. Используется для обнаружения вирусов в электронных письмах и других файлах.',
-		selected: false,
+		default: 'yes',
 	},
 	{
-		name: ' --uselocalphp',
+		flag: 'usemirrorclamav',
-		id: 'uselocalphp',
+		label: 'Российское зеркало ClamAV',
-		param: '--uselocalphp',
+		description:
-		desc: 'Использовать PHP из текущего репозитория HestiaCP',
+			'Использовать российское зеркало для обновления вирусных баз ClamAV. Подходит для серверов, расположенных в России или соседних регионах, где загрузка с официального источника медленная или нестабильная. Базы будут загружаться с repo.brepo.ru, возможна задержка в несколько часов.',
-		selected: false,
+		default: 'no',
 	},
 	{
-		name: ' --usemirrorclamav',
+		flag: 'spamassassin',
-		id: 'usemirrorclamav',
+		label: 'SpamAssassin',
-		param: '--usemirrorclamav',
+		description:
-		desc: 'Использовать clamav с базами скачанными с зеркала в России',
+			'SpamAssassin — это инструмент с открытым исходным кодом для идентификации и фильтрации спама. Он анализирует заголовки, тело и информацию об отправителе письма, применяя ряд правил для оценки того, является ли письмо спамом.',
-		selected: false,
+		default: 'yes',
 	},
 	{
-		name: ' --fail2ban',
+		flag: 'firewall',
-		id: 'fail2ban',
+		label: 'Системный брандмауэр',
-		param: '--fail2ban',
+		description:
-		desc: 'Предотвращение Bruteforce атак на SSH, Email, FTP, БД.',
+			'Использовать firewalld / nftables в качестве системного брандмауэра.<br>\n<br>⚠️ Внимание: Если после установки вы не можете получить доступ к панели через публичный IP (например, доступ только через localhost), это обычно означает, что порт 8083 не открыт в брандмауэре.\n\nРешение:\n\n<pre><code>firewall-cmd --permanent --add-port=8083/tcp\nfirewall-cmd --reload</code></pre>\n\nПри использовании nftables:\n\n<pre><code>nft add rule inet filter input tcp dport 8083 accept</code></pre>\n\nРекомендуется оставить брандмауэр включенным для повышения безопасности, возможна совместная работа с Fail2Ban для защиты от брутфорса.',
-		selected: true,
+		default: 'yes',
 	},
 	{
-		name: ' --quota',
+		flag: 'bunkerweb',
-		id: 'quota',
+		label: 'Межсетевой экран WAF Bunkerweb',
-		param: '--quota',
+		description:
-		desc: 'Использовать квоты на пользовательские аккаунты.',
+			'Bunkerweb — это межсетевой экран веб-приложений (WAF) с открытым исходным кодом, обеспечивающий защиту на основе основных правил OWASP, черные/белые списки IP, ограничение скорости, HTTP-заголовки безопасности и другие функции безопасности.',
-		selected: false,
+		default: 'no',
 	},
-	{ name: ' --api', id: 'api', param: '--api', desc: 'Activate API.', selected: true },
 	{
-		name: ' --interactive',
+		flag: 'uselocalphp',
-		id: 'interactive',
+		label: 'Использовать официальную сборку PHP от Hestia',
-		param: '--interactive',
+		description:
-		desc: 'Интерактивная установка.',
+			'Использовать версию PHP из официального репозитория HestiaCP вместо стандартного источника операционной системы. При включении пакеты PHP будут загружаться из репозитория brepo, что обеспечивает единообразие версий и совместимость.',
-		selected: true,
+		default: 'no',
+	},
+	{
+		flag: 'fail2ban',
+		label: 'Fail2Ban',
+		description:
+			'Fail2Ban может автоматически обнаруживать и блокировать пользователей, использующих недействительные данные аутентификации, например, при попытках взлома SSH, FTP и т.д.',
+		default: 'yes',
+	},
+	{
+		flag: 'quota',
+		label: 'Дисковые квоты',
+		description:
+			'Установить квоты на дисковое пространство для системных пользователей, ограничивая использование дискового пространства.',
+		default: 'no',
+	},
+	{
+		flag: 'api',
+		label: 'Hestia API',
+		description:
+			'Включить внутренний API Hestia, позволяющий другим системам или сервисам взаимодействовать с панелью.',
+		default: 'yes',
+	},
+	{
+		flag: 'interactive',
+		label: 'Интерактивная установка',
+		description:
+			'Включить интерактивный режим во время установки, чтобы пользователь мог отвечать на запросы и выбирать опции.',
+		default: 'yes',
+	},
+	{
+		flag: 'force',
+		label: 'Принудительная установка',
+		description:
+			'Принудительно перезаписать любые существующие конфигурации и файлы во время установки. В дистрибутивах семейства RHEL рекомендуется включить этот параметр. Перезаписывает конфигурацию администратора по умолчанию.',
+		default: 'no',
 	},
-	{ name: ' --force', id: 'force', param: '--force', desc: 'Принудительная установка.', selected: false },
 ];

docs/_data/team.js

@@ -3,46 +3,33 @@ export const projectManagers = [
 	{
 		avatar: 'https://www.github.com/ScIT-Raphael.png',
 		name: 'Raphael Schneeberger 🇨🇭',
-		title: 'Project Founder',
+		title: 'Основатель проекта',
 		links: [{ icon: 'github', link: 'https://github.com/ScIT-Raphael' }],
 	},
 	{
 		avatar: 'https://www.github.com/jaapmarcus.png',
 		name: 'Jaap Marcus 🇳🇱',
-		links: [
+		links: [{ icon: 'github', link: 'https://github.com/jaapmarcus' }],
-			{ icon: 'github', link: 'https://github.com/jaapmarcus' },
-			{ icon: 'twitter', link: 'https://twitter.com/jaapmarcus' },
-		],
 	},
 	{
 		avatar: 'https://www.github.com/Lupul.png',
 		name: 'Robert Zollner 🇷🇴',
 		links: [{ icon: 'github', link: 'https://github.com/Lupul' }],
 	},
-	{
-		avatar: 'https://www.github.com/krismkenn.png',
-		name: 'Kristan Kenney 🇨🇦',
-		links: [{ icon: 'github', link: 'https://github.com/krismkenn' }],
-	},
 ];
 
+const globeIcon = {
+	svg: '🌐',
+};
+
 /** @type {import("vitepress").DefaultTheme.TeamMember[]} */
 export const teamMembers = [
 	{
-		avatar: 'https://www.github.com/jakobbouchard.png',
+		avatar: 'https://www.github.com/imjuniper.png',
-		name: 'Jakob Bouchard 🇨🇦',
+		name: 'Juniper Bouchard 🇨🇦',
-		title: 'Developer',
-		org: 'Prosomo',
-		orgLink: 'https://prosomo.com',
 		links: [
-			{ icon: 'github', link: 'https://github.com/jakobbouchard' },
+			{ icon: 'github', link: 'https://github.com/imjuniper' },
-			{ icon: 'linkedin', link: 'https://linkedin.com/in/jakobbouchard' },
+			{ icon: globeIcon, link: 'https://imjuniper.fyi' },
-			{
-				icon: {
-					svg: '<svg role="img" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><title>Website</title><path stroke-linecap="round" stroke-linejoin="round" d="M21 12a9 9 0 01-9 9m9-9a9 9 0 00-9-9m9 9H3m9 9a9 9 0 01-9-9m9 9c1.657 0 3-4.03 3-9s-1.343-9-3-9m0 18c-1.657 0-3-4.03-3-9s1.343-9 3-9m-9 9a9 9 0 019-9" /></svg>',
-				},
-				link: 'https://jakobbouchard.dev',
-			},
 		],
 	},
 	{
@@ -56,11 +43,6 @@ export const teamMembers = [
 		name: 'divinity76 🇳🇴',
 		links: [{ icon: 'github', link: 'https://github.com/divinity76' }],
 	},
-	{
-		avatar: 'https://www.github.com/istiak101.png',
-		name: 'istiak101 🇧🇩',
-		links: [{ icon: 'github', link: 'https://github.com/istiak101' }],
-	},
 	{
 		avatar: 'https://www.github.com/Pleskan.png',
 		name: 'Anton Pleskanovskyy 🇺🇦',
@@ -69,6 +51,33 @@ export const teamMembers = [
 	{
 		avatar: 'https://www.github.com/AlecRust.png',
 		name: 'Alec Rust 🇬🇧',
-		links: [{ icon: 'github', link: 'https://github.com/AlecRust' }],
+		links: [
+			{ icon: 'github', link: 'https://github.com/AlecRust' },
+			{ icon: globeIcon, link: 'https://www.alecrust.com/' },
+		],
+	},
+	{
+		avatar: 'https://github.com/ioannidesalex.png',
+		name: 'Alexandros Ioannides 🇨🇾',
+		title: 'Технический директор (CTO)',
+		org: 'FocusNet',
+		orgLink: 'https://focus-net.net',
+		links: [
+			{ icon: 'github', link: 'https://github.com/ioannidesalex' },
+			{ icon: 'linkedin', link: 'https://www.linkedin.com/in/ioannidesa' },
+		],
+	},
+];
+/** @type {import("vitepress").DefaultTheme.TeamMember[]} */
+export const teamRpm = [
+	{
+		avatar: 'https://www.github.com/bayrepo.png',
+		name: 'Alexey Berezhok 🇷🇺',
+		title: 'Сопровождающий RPM-версии',
+		desc: 'Отвечает за адаптацию и поддержку экосистем RHEL / Rocky / AlmaLinux.',
+		links: [
+			{ icon: 'github', link: 'https://github.com/bayrepo' },
+			{ icon: globeIcon, link: 'https://hestiadocs.brepo.ru' },
+		],
 	},
 ];

docs/docs/introduction/getting-started.md

@@ -13,12 +13,12 @@ Hestia необходимо установить поверх новой уст
 Если на VPS/KVM уже есть учетная запись администратора, либо удалите этот идентификатор администратора по умолчанию, либо используйте `--force`, чтобы продолжить установку. Дополнительные сведения см. в разделе «Выборочная установка» ниже.
 :::
 
-| | Минимум | Рекомендуется |
+| Компонент                                | Минимум                                                  | Рекомендуется                                          |
-| -------------------- | --------------------------------------------- | ------------------------------------ |
+| :--------------------------------------- | :------------------------------------------------------- | :----------------------------------------------------- |
-| **ЦП** | 1 ядро, 64-разрядный | 4 ядра |
+| **ЦП**                                   | 1 ядро, 64-разрядный                                     | 4 ядра                                                 |
-| **Память** | 1 ГБ (без SpamAssassin и ClamAV) | 4 ГБ |
+| **Память**                               | 1 ГБ (без SpamAssassin и ClamAV)                         | 4 ГБ                                                   |
-| **Диск** | 10 ГБ HDD | 40 ГБ SSD |
+| **Диск**                                 | 10 ГБ HDD                                                | 40 ГБ SSD                                              |
-| **Операционная система** | Debian 10, 11 или 12<br>Ubuntu 20.04, 22.04 LTS | Последняя версия Debian <br> Последняя версия Ubuntu LTS |
+| **Операционная система (RPM)**           | AlmaLinux 9<br>Rocky Linux 9              | Rocky Linux 9<br>AlmaLinux 9         |
 
 ::: warning
 Hestia работает только на процессорах AMD64 / x86_64 и ARM64 / aarch64. Также требуется 64-разрядная операционная система!
@@ -28,7 +28,6 @@ Hestia работает только на процессорах AMD64 / x86_64
 
 ### Поддерживаемые операционные системы
 
-- MSVSphere 9
 - AlmaLinux 9
 - Rocky Linux 9
 
@@ -79,37 +78,36 @@ bash hst-install.sh -h
 Чтобы выбрать, какое программное обеспечение будет установлено, вы можете указать флаги в скрипте установки. Полный список параметров можно просмотреть ниже.
 
 ```bash
-  -a, --apache            Install Apache             [yes|no]   default: yes
+-a, --apache Install Apache [yes | no] default: yes
-  -w, --phpfpm            Install PHP-FPM            [yes|no]   default: yes
+-w, --phpfpm Install PHP-FPM [yes | no] default: yes
-  -o, --multiphp          Install Multi-PHP          [yes|no]   default: no
+-o, --multiphp Install Multi-PHP [yes | no] default: no
-  -v, --vsftpd            Install Vsftpd             [yes|no]   default: yes
+-v, --vsftpd Install Vsftpd [yes | no] default: yes
-  -j, --proftpd           Install ProFTPD            [yes|no]   default: no
+-j, --proftpd Install ProFTPD [yes | no] default: no
-  -k, --named             Install Bind               [yes|no]   default: yes
+-k, --named Install Bind [yes | no] default: yes
-  -m, --mysql             Install MariaDB            [yes|no]   default: yes
+-m, --mysql Install MariaDB [yes | no] default: yes
-  -M, --mysql-classic     Install MySQL 8            [yes|no]   default: no
+-M, --mysql-classic Install MySQL 8 [yes | no] default: no
-  -g, --postgresql        Install PostgreSQL         [yes|no]   default: no
+-g, --postgresql Install PostgreSQL [yes | no] default: no
-  -x, --exim              Install Exim               [yes|no]   default: yes
+-x, --exim Install Exim [yes | no] default: yes
-  -z, --dovecot           Install Dovecot            [yes|no]   default: yes
+-z, --dovecot Install Dovecot [yes | no] default: yes
-  -Z, --sieve             Install Sieve              [yes|no]   default: no
+-Z, --sieve Install Sieve [yes | no] default: no
-  -c, --clamav            Install ClamAV             [yes|no]   default: no
+-c, --clamav Install ClamAV [yes | no] default: no
-  -t, --spamassassin      Install SpamAssassin       [yes|no]   default: yes
+-t, --spamassassin Install SpamAssassin [yes | no] default: yes
-  -i, --firewall          Install firewalld          [yes|no]   default: yes
+-i, --firewall Install firewalld [yes | no] default: yes
-  -b, --fail2ban          Install Fail2ban           [yes|no]   default: yes
+-b, --fail2ban Install Fail2ban [yes | no] default: yes
-  -q, --quota             Filesystem Quota           [yes|no]   default: no
+-q, --quota Filesystem Quota [yes | no] default: no
-  -d, --api               Activate API               [yes|no]   default: yes
+-d, --api Activate API [yes | no] default: yes
-  -r, --port              Change Backend Port                   default: 8083
+-r, --port Change Backend Port default: 8083
-  -l, --lang              Default language                      default: en
+-l, --lang Default language default: en
-  -y, --interactive       Interactive install        [yes|no]   default: yes
+-y, --interactive Interactive install [yes | no] default: yes
-  -I, --nopublicip        Use local ip               [yes|no]   default: no
+-I, --nopublicip Use local ip [yes | no] default: no
-  -u, --uselocalphp       Use PHP from local repo    [yes|no]   default: no
+-u, --uselocalphp Use PHP from local repo [yes | no] default: no
-  -C, --usemirrorclamav   Use mirrored clamav        [yes|no]   default: no
+-C, --usemirrorclamav Use mirrored clamav [yes | no] default: no
-  -s, --hostname          Set hostname
+-s, --hostname Set hostname
-  -e, --email             Set admin email
+-e, --email Set admin email
-  -p, --password          Set admin password
+-p, --password Set admin password
-  -R, --with-rpms         Path to Hestia rpms
+-R, --with-rpms Path to Hestia rpms
-  -f, --force             Force installation
+-f, --force Force installation
-  -h, --help              Print this help
+-h, --help Print this help
-
 ```
 
 #### Пример
@@ -149,4 +147,4 @@ bash hst-install.sh \
 
 - `-I, --nopublicip` - если установлена данная опция, то установщик панели не получает внешний IP адрес сервера, где контрольная панель устанавливается (на случай если ваш сервер за NAT). Данную опцию можно включать, если у вас на сервере публичный IP или необходима внутрисетевая установка без внешнего доступа.
 
-- `-u, --uselocalphp` - включить установку пакетов PHP из того-же репозитория, откуда ставится HestiaCP RPM Edition. Если не включать данную опцию, то PHP пакеты будут установлены из репозитория Remi. Если включить, то будет произведена так называемая установка локальных пакетов. Есть отличия в способе упаковке Local PHP и Remi PHP. Если сервера требуется расширенный набор PHP из Remi репозитория, то данную опцию лучше отключить, т.е задать `--uselocalphp no`. Local PHP более простая сборка с меньшим числом поддерживаемых модулей PHP, но подходит для большинства конфигураций CMS и имеет [страницу настройки подключаемых модулей](/docs/extensions/local-php.md)
+- `-u, --uselocalphp` - включить установку пакетов PHP из того-же репозитория, откуда ставится HestiaCP RPM Edition. Если не включать данную опцию, то PHP пакеты будут установлены из репозитория Remi. Если включить, то будет произведена так называемая установка локальных пакетов. Есть отличия в способе упаковке Local PHP и Remi PHP. Если сервера требуется расширенный набор PHP из Remi репозитория, то данную опцию лучше отключить, т.е задать `--uselocalphp no`. Local PHP более простая сборка с меньшим числом поддерживаемых модулей PHP, но подходит для большинства конфигураций CMS и имеет [страницу настройки подключаемых модулей](/docs/extensions/local-php.md)

docs/docs/server-administration/os-upgrades.md

@@ -24,13 +24,6 @@ yum update
 sed -i "s/obscure yescrypt/obscure sha512/g" /etc/pam.d/common-password
 ```
 
-### Конфигурация Exim4
-
-```bash
-rm -f /etc/exim4/exim4.conf.template
-cp -f /usr/local/hestia/install/deb/exim/exim4.conf.4.94.template /etc/exim4/exim4.conf.template
-```
-
 ### ProFTPD
 
-Закомментируйте [строку 29](https://github.com/hestiacp/hestiacp/blob/1ff8a4e5207aae1e241954a83b7e8070bcdca788/install/deb/proftpd/proftpd.conf#L29) в `/etc/profpd/prodtpd.conf`.
+Закомментируйте [строку 29](https://github.com/hestiacp/hestiacp/blob/1ff8a4e5207aae1e241954a83b7e8070bcdca788/install/deb/proftpd/proftpd.conf#L29) в `/etc/profpd/prodtpd.conf`.

docs/donate.md

@@ -1,17 +0,0 @@
----
-aside: false
-lastUpdated: false
----
-
-# Donate to the project
-
-By donating to Hestia, you help maintain server costs, development time, and more!
-
-Here are our official donation platforms:
-
-- [PayPal](https://www.paypal.com/donate/?cmd=_s-xclick&hosted_button_id=ST87LQH2CHGLA)
-- Crypto
-  - Bitcoin: bc1q48jt5wg5jaj8g9zy7c3j03cv57j2m2u5anlutu
-  - Ethereum: 0xfF3Dd2c889bd0Ff73d8085B84A314FC7c88e5D51
-  - Binance: bnb1l4ywvw5ejfmsgjdcx8jn5lxj7zsun8ktfu7rh8
-  - Smart Chain: 0xfF3Dd2c889bd0Ff73d8085B84A314FC7c88e5D51

docs/index.md

@@ -15,22 +15,27 @@ hero:
     - theme: brand
       text: Начало работы
       link: /docs/introduction/getting-started
-    - theme: alt
+    - theme: brand
       text: RPM версия
       link: https://dev.brepo.ru/bayrepo/hestiacp
-    - theme: alt
+    - theme: brand
-      text: Оригинальная панель для Debian/Ubuntu
+      text: Оригинал для Debian/Ubuntu
       link: https://github.com/hestiacp/hestiacp
 
 features:
   - icon: 🚀
-    title: Быстро и легко обучиться
+    title: Минималистичный опыт эксплуатации и обслуживания
-    details: Hestia создана с учетом простоты использования. Создать пользователя или веб-сайт так же просто, как нажать кнопку и заполнить пару полей, при этом расширенные функции легко доступны.
+    details: Hestia разработана с учётом простоты использования. Создание пользователя или сайта так же просто, как нажать на кнопку и заполнить несколько полей. Расширенные функции также настраиваются очень легко.
     link: /docs/introduction/getting-started
     linkText: Документация
+  - icon: ❤️
+    title: Сделано с душой и гордостью
+    details: Hestia — это开源 серверное программное обеспечение, созданное увлечёнными разработчиками со всего мира. Это означает, что код проверяется многими людьми, и каждый может внести свой вклад в его развитие!
+    link: /team
+    linkText: Команда
   - icon: 🛠️
-    title: Мощная и расширяемая
+    title: Расширяемая и мощная
-    details: Hestia расширяема и проста в освоении. Вы можете создавать свои собственные темы, веб-шаблоны, быстро устанавливать приложения и взаимодействовать с ней с помощью программного обеспечения сторонних производителей через ее API.
+    details: Hestia расширяема и проста в освоении. Вы можете создавать свои собственные темы, веб-шаблоны, быстро устанавливать приложения и взаимодействовать с ней с помощью программного обеспечения сторонних производителей через её API.
     link: /docs/contributing/development
-    linkText: Помощь в разработке Hestia
+    linkText: Помочь разработке Hestia
 ---

docs/install.md

@@ -1,23 +1,54 @@
 ---
 layout: page
-title: Install
+title: Установка панели
 ---
 
 <script setup>
-  import InstallPageTitle from "./.vitepress/theme/components/InstallPageTitle.vue";
+  import PageHeader from './.vitepress/theme/components/PageHeader.vue';
-  import InstallOptions from "./.vitepress/theme/components/InstallOptions.vue";
+  import InstallOptions from './.vitepress/theme/components/InstallOptions.vue';
-  import InstallOptionsSection from "./.vitepress/theme/components/InstallOptionsSection.vue";
+  import InstallPage from './.vitepress/theme/components/InstallPage.vue';
-  import { options } from "./_data/options";
+  import { options } from './_data/options';
-  import { languages } from "./_data/languages";
 </script>
 
 <InstallPage>
-  <InstallPageTitle>
+  <PageHeader>
-	<template #title>Генератор установочной команды</template>
+    <template #title>Генератор конфигурации для быстрой установки панели управления сервером Hestia</template>
-  </InstallPageTitle>
+  </PageHeader>
-  <InstallOptionsSection>
+  <PageHeader>
-  	<template #list>
+    <template #aside><a class="header-button" href="./docs/introduction/getting-started#требования">Посмотреть требования к установке</a></template>  
-	  <InstallOptions :items="options" :languages="languages"></InstallOptions>
+  </PageHeader>
-	</template>
+  <InstallOptions :options="options"></InstallOptions>
-  </InstallOptionsSection>
 </InstallPage>
+
+<style>
+.header-button {
+  display: inline-block;
+  border: 1px solid transparent;
+  font-weight: 600;
+  transition: color 0.25s, border-color 0.25s, background-color 0.25s;
+  border-radius: 20px;
+  padding: 0 20px;
+  line-height: 38px;
+  font-size: 14px;
+  border-color: var(--vp-button-alt-border);
+  color: var(--vp-button-alt-text);
+  background-color: var(--vp-button-alt-bg);
+
+  &:hover {
+    border-color: var(--vp-button-alt-hover-border);
+    color: var(--vp-button-alt-hover-text);
+    background-color: var(--vp-button-alt-hover-bg);
+  }
+}
+</style>
+
+<style>
+  .header-button {  
+    color: white;
+    background-color: var(--vp-c-brand);
+  }  
+  .header-button:hover {
+    color: white;
+    background-color: #d8036a;
+  }  
+</style>

docs/team.md

@@ -1,37 +1,38 @@
 ---
 layout: page
-
+title: Команда
-title: The Team
 ---
 
+<style>
+.VPTeamPageSection {
+  margin-top: 50px !important;
+}
+</style>
 <script setup>
   import { VPTeamPage, VPTeamPageTitle, VPTeamPageSection, VPTeamMembers } from "vitepress/theme";
-  import { projectManagers, teamMembers } from "./_data/team";
+  import { projectManagers, teamMembers, teamRpm } from "./_data/team";
 </script>
-
-<VPTeamPage>
   <VPTeamPageTitle>
-    <template #title>The Team</template>
+    <template #title>Команда</template>
     <template #lead>
-      The development of Hestia is guided by an international team, some of whom have chosen to be featured below.
+    Разработка Hestia осуществляется международной командой, некоторые из участников которой представлены ниже.
     </template>
   </VPTeamPageTitle>
   <VPTeamPageSection>
-    <template #title>Project Managers</template>
+    <template #title>Руководители проекта</template>
     <template #members>
       <VPTeamMembers :members="projectManagers" />
     </template>
   </VPTeamPageSection>
   <VPTeamPageSection>
-    <template #title>Team Members</template>
+    <template #title>Участники команды</template>
     <template #members>
       <VPTeamMembers :members="teamMembers" />
     </template>
   </VPTeamPageSection>
-  <!-- <VPTeamPageSection>
+  <VPTeamPageSection>
-    <template #title>Contributors ❤️</template>
+    <template #title>Сопровождающий RPM-версии</template>
     <template #members>
-      <VPTeamMembers size="small" :members="featuredContributors" />
+      <VPTeamMembers :members="teamRpm" />
     </template>
-  </VPTeamPageSection> -->
+  </VPTeamPageSection>
-</VPTeamPage>

func/domain.sh

@@ -889,7 +889,7 @@ add_mail_ssl_config() {
 		echo "  ssl_key = <$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key" >> /etc/dovecot/conf.d/domains/$domain.conf
 		echo "}" >> /etc/dovecot/conf.d/domains/$domain.conf
 
-		# Add domain SSL configuration to exim4
+		# Add domain SSL configuration to exim
 		ln -s $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.pem $HESTIA/ssl/mail/$domain.crt
 		ln -s $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key $HESTIA/ssl/mail/$domain.key
 	fi
@@ -901,7 +901,7 @@ add_mail_ssl_config() {
 	echo "  ssl_key = <$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key" >> /etc/dovecot/conf.d/domains/$domain.conf
 	echo "}" >> /etc/dovecot/conf.d/domains/$domain.conf
 
-	# Add domain SSL configuration to exim4
+	# Add domain SSL configuration to exim
 	ln -s $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.pem $HESTIA/ssl/mail/mail.$domain.crt
 	ln -s $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key $HESTIA/ssl/mail/mail.$domain.key
 

func/rebuild.sh

@@ -736,7 +736,7 @@ rebuild_mail_domain_conf() {
 				echo "$account@$domain_idn:$user_rate_limit" >> $HOMEDIR/$user/conf/mail/$domain/limits
 			else
 				#revert to system value
-				system=$(cat /etc/exim4/limit.conf)
+				system=$(cat /etc/exim/limit.conf)
 				sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 				echo "$account@$domain_idn:$system" >> $HOMEDIR/$user/conf/mail/$domain/limits
 			fi

install/common/dovecot/conf.d/auth-passwdfile.conf.ext

@@ -1,9 +1,9 @@
 passdb {
   driver = passwd-file
-  args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd
+  args = scheme=MD5-CRYPT username_format=%n /etc/exim/domains/%d/passwd
 }
 
 userdb {
   driver = passwd-file
-  args = username_format=%n /etc/exim4/domains/%d/passwd
+  args = username_format=%n /etc/exim/domains/%d/passwd
 }

install/deb/apache2/apache2.conf

@@ -1,96 +0,0 @@
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-#	/etc/apache2/
-#	|-- apache2.conf
-#	|	`--  ports.conf
-#	|-- mods-enabled
-#	|	|-- *.load
-#	|	`-- *.conf
-#	|-- conf.d
-#	|	`-- *
-
-# Global configuration
-PidFile ${APACHE_PID_FILE}
-Timeout 30
-KeepAlive Off
-MaxKeepAliveRequests 100
-KeepAliveTimeout 10
-
-<IfModule mpm_prefork_module>
-    StartServers          8
-    MinSpareServers       5
-    MaxSpareServers      20
-    ServerLimit         256
-    MaxClients          200
-    MaxRequestsPerChild 4000
-</IfModule>
-
-<IfModule mpm_worker_module>
-    StartServers          2
-    MinSpareThreads      25
-    MaxSpareThreads      75
-    ThreadLimit          64
-    ThreadsPerChild      25
-    MaxClients          200
-    MaxRequestsPerChild 4000
-</IfModule>
-
-<IfModule mpm_event_module>
-    StartServers          2
-    MinSpareThreads      25
-    MaxSpareThreads      75
-    ThreadLimit          64
-    ThreadsPerChild      25
-    MaxClients          200
-    MaxRequestsPerChild 4000
-</IfModule>
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-#User www-data
-#Group www-data
-
-AccessFileName .htaccess
-
-<Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
-    Satisfy all
-</Files>
-
-DefaultType None
-HostnameLookups Off
-
-ErrorLog ${APACHE_LOG_DIR}/error.log
-LogLevel warn
-
-# Include module configuration:
-Include mods-enabled/*.load
-Include mods-enabled/*.conf
-
-# Include list of ports to listen on and which to use for name based vhosts
-Include ports.conf
-
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-LogFormat "%b" bytes
-
-IncludeOptional conf.d/*.conf
-IncludeOptional conf.d/domains/webmail.*.conf
-IncludeOptional conf.d/domains/*.conf
-
-# Include the virtual host configurations:
-#Include sites-enabled/
-
-ErrorDocument 403 /error/403.html
-ErrorDocument 404 /error/404.html
-ErrorDocument 500 /error/50x.html
-ErrorDocument 501 /error/50x.html
-ErrorDocument 502 /error/50x.html
-ErrorDocument 503 /error/50x.html
-ErrorDocument 506 /error/50x.html

install/deb/apache2/hestia-event.conf

@@ -1,5 +0,0 @@
-<IfModule mpm_event_module>
-    <FilesMatch \.php$>
-        SetHandler "proxy:fcgi://127.0.0.1:9000"
-    </FilesMatch>
-</IfModule>

install/deb/apache2/status.conf

@@ -1,7 +0,0 @@
-Listen 127.0.0.1:8081
-<Location /server-status>
-    SetHandler server-status
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
-</Location>

install/deb/apache2/unassigned.conf

@@ -1,18 +0,0 @@
-<VirtualHost directIP:directPORT>
-    ServerName directIP
-    DocumentRoot /var/www/html/
-    Alias /error/ /var/www/document_errors/
-
-</VirtualHost>
-
-<VirtualHost directIP:directSSLPORT>
-    ServerName directIP
-    DocumentRoot /var/www/html/
-    Alias /error/ /var/www/document_errors/
-
-    SSLEngine on
-    SSLVerifyClient none
-    SSLCertificateFile         /usr/local/hestia/ssl/certificate.crt
-    SSLCertificateKeyFile      /usr/local/hestia/ssl/certificate.key
-
-</VirtualHost>

install/deb/bind/named.conf

@@ -1,12 +0,0 @@
-// This is the primary configuration file for the BIND DNS server named.
-//
-// Please read /usr/share/doc/bind9/README.Debian.gz for information on the
-// structure of BIND configuration files in Debian, *BEFORE* you customize
-// this configuration file.
-//
-// If you are just adding zones, please do that in /etc/bind/named.conf.local
-
-include "/etc/bind/named.conf.options";
-include "/etc/bind/named.conf.local";
-include "/etc/bind/named.conf.default-zones";
-

install/deb/bind/named.conf.options

@@ -1,24 +0,0 @@
-options {
-        directory "/var/cache/bind";
-         // If there is a firewall between you and nameservers you want
-        // to talk to, you may need to fix the firewall to allow multiple
-        // ports to talk.  See http://www.kb.cert.org/vuls/id/800113
-         // If your ISP provided one or more IP addresses for stable
-        // nameservers, you probably want to use them as forwarders.
-        // Uncomment the following block, and insert the addresses replacing
-        // the all-0's placeholder.
-         // forwarders {
-        //      0.0.0.0;
-        // };
-         //========================================================================
-        // If BIND logs error messages about the root key being expired,
-        // you will need to update your keys.  See https://www.isc.org/bind-keys
-        //========================================================================
-        dnssec-validation auto;
-        auth-nxdomain no;
-        allow-recursion { 127.0.0.1; ::1; };
-        allow-transfer {"none";};
-        hostname none;
-        server-id none;
-        version none;
-};

install/deb/clamav/clamd.conf

@@ -1,88 +0,0 @@
-#Automatically Generated by clamav-daemon postinst
-#To reconfigure clamd run #dpkg-reconfigure clamav-daemon
-#Please read /usr/share/doc/clamav-daemon/README.Debian.gz for details
-LocalSocket /run/clamav/clamd.ctl
-FixStaleSocket true
-LocalSocketGroup clamav
-LocalSocketMode 666
-# TemporaryDirectory is not set to its default /tmp here to make overriding
-# the default with environment variables TMPDIR/TMP/TEMP possible
-User clamav
-ScanMail true
-ScanArchive true
-ArchiveBlockEncrypted false
-MaxDirectoryRecursion 15
-FollowDirectorySymlinks false
-FollowFileSymlinks false
-ReadTimeout 180
-MaxThreads 12
-MaxConnectionQueueLength 15
-LogSyslog false
-LogRotate true
-LogFacility LOG_LOCAL6
-LogClean false
-LogVerbose true
-PreludeEnable no
-PreludeAnalyzerName ClamAV
-DatabaseDirectory /var/lib/clamav
-OfficialDatabaseOnly false
-SelfCheck 3600
-Foreground false
-Debug false
-ScanPE true
-MaxEmbeddedPE 10M
-ScanOLE2 true
-ScanPDF true
-ScanHTML true
-MaxHTMLNormalize 10M
-MaxHTMLNoTags 2M
-MaxScriptNormalize 5M
-MaxZipTypeRcg 1M
-ScanSWF true
-ExitOnOOM false
-LeaveTemporaryFiles false
-AlgorithmicDetection true
-ScanELF true
-IdleTimeout 30
-CrossFilesystems true
-PhishingSignatures true
-PhishingScanURLs true
-PhishingAlwaysBlockSSLMismatch false
-PhishingAlwaysBlockCloak false
-PartitionIntersection false
-DetectPUA false
-ScanPartialMessages false
-HeuristicScanPrecedence false
-StructuredDataDetection false
-CommandReadTimeout 5
-SendBufTimeout 200
-MaxQueue 100
-ExtendedDetectionInfo true
-OLE2BlockMacros false
-AllowAllMatchScan true
-ForceToDisk false
-DisableCertCheck false
-DisableCache false
-MaxScanTime 120000
-MaxScanSize 100M
-MaxFileSize 25M
-MaxRecursion 16
-MaxFiles 10000
-MaxPartitions 50
-MaxIconsPE 100
-PCREMatchLimit 10000
-PCRERecMatchLimit 5000
-PCREMaxFileSize 25M
-ScanXMLDOCS true
-ScanHWP3 true
-MaxRecHWP3 16
-StreamMaxLength 25M
-LogFile /var/log/clamav/clamav.log
-LogTime true
-LogFileUnlock false
-LogFileMaxSize 0
-Bytecode true
-BytecodeSecurity TrustSigned
-BytecodeTimeout 60000
-PidFile /run/clamav/clamd.pid
-OnAccessMaxFileSize 5M

install/deb/deb_signing.key

@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD
-G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x
-QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf
-fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2
-oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY
-2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g
-PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ
-CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb
-VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN
-QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh
-IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6
-Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3
-WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN
-BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz
-QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95
-k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC
-YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt
-i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS
-ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA
-CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR
-+EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8
-XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC
-CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN
-qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq
-ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ==
-=J2HJ
------END PGP PUBLIC KEY BLOCK-----

install/deb/exim/dnsbl.conf

@@ -1,2 +0,0 @@
-bl.spamcop.net
-zen.spamhaus.org

install/deb/exim/exim4.conf.4.94.template

@@ -1,476 +0,0 @@
-######################################################################
-#                                                                    #
-#          Exim configuration file for Hestia Control Panel          #
-#                                                                    #
-######################################################################
-
-#SPAMASSASSIN = yes
-#SPAM_SCORE = 50
-#SPAM_REJECT_SCORE = 100
-#CLAMD = yes
-
-smtp_banner = $smtp_active_hostname
-smtp_active_hostname = ${lookup dnsdb{>: defer_never,ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}}
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
-disable_ipv6 = true
-
-smtputf8_advertise_hosts =
-domainlist local_domains = dsearch;/etc/exim4/domains/
-domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
-hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
-hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
-no_local_from_check
-untrusted_set_sender = *
-acl_smtp_connect = acl_check_spammers
-acl_smtp_mail = acl_check_mail
-acl_smtp_rcpt = acl_check_rcpt
-acl_smtp_data = acl_check_data
-acl_smtp_mime = acl_check_mime
-
-.ifdef SPAMASSASSIN
-spamd_address = 127.0.0.1 783
-.endif
-
-.ifdef CLAMD
-av_scanner = clamd: /run/clamav/clamd.ctl
-.endif
-
-log_selector = +tls_sni
-
-tls_advertise_hosts = *
-
-# We test that $tls_in_sni is a valid domain, by an arbitrary email address foo@domain.tld .
-# Then, we extract the domain with a function that would fail if the email address is invalid.
-# If the certificate exists, we will use it, otherwise the default certificate in /etc/ssl will be used.
-tls_certificate = \
-        ${if and {\
-                     { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\
-                     { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.crt} }\
-                 }\
-                 {/usr/local/hestia/ssl/mail/$tls_in_sni.crt}\
-                 {/usr/local/hestia/ssl/certificate.crt}\
-         }
-
-tls_privatekey = \
-        ${if and {\
-                     { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\
-                     { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.key} }\
-                 }\
-                 {/usr/local/hestia/ssl/mail/$tls_in_sni.key}\
-                 {/usr/local/hestia/ssl/certificate.key}\
-         }
-
-daemon_smtp_ports = 25 : 465 : 587
-tls_on_connect_ports = 465
-tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE
-never_users = root
-host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 0s
-ignore_bounce_errors_after = 2d
-timeout_frozen_after = 7d
-
-DKIM_DOMAIN = ${lc:${domain:$h_from:}}
-DKIM_FILE = /etc/exim4/domains/${lookup{${lc:${domain:$h_from:}}}dsearch{/etc/exim4/domains/}}/dkim.pem
-DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}}
-
-OUTGOING_IP = /etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/ip
-
-SMTP_RELAY_FILE = ${if exists{/etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/smtp_relay.conf}{/etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/smtp_relay.conf}{/etc/exim4/smtp_relay.conf}}
-SMTP_RELAY_HOST = ${lookup{host}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_PORT = ${lookup{port}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_USER = ${lookup{user}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_PASS = ${lookup{pass}lsearch{SMTP_RELAY_FILE}}
-
-# Custom Filter
-system_filter = /etc/exim4/system.filter
-system_filter_user = Debian-exim
-
-######################################################################
-#                       ACL CONFIGURATION                            #
-#         Specifies access control lists for incoming SMTP mail      #
-######################################################################
-
-acl_not_smtp = acl_not_smtp
-
-begin acl
-
-# Limit per user for PHP scripts
-acl_not_smtp:
-  deny    message       = Website of user $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period
-  ratelimit             = 200 / 1h / $authenticated_id
-
-  warn    ratelimit     = 100 / 1h / strict / $authenticated_id
-  log_message           = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period
-
-  accept
-
-acl_check_spammers:
-  accept  hosts         = +whitelist
-
-  drop    message       = Your host in blacklist on this server.
-          log_message   = Host in blacklist
-          hosts         = +spammers
-
-  accept
-
-
-acl_check_mail:
-  deny    condition     = ${if eq{$sender_helo_name}{}}
-          message       = HELO required before MAIL
-
-  drop    !authenticated = *
-    	  message       =  Helo name contains an IP address (HELO was $sender_helo_name) and not is valid
-          condition     = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}}
-          condition     = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}}
-          delay         = 45s
-
-  drop    !authenticated = *
-		  condition     = ${if isip{$sender_helo_name}}
-          message       = Access denied - Invalid HELO name (See RFC2821 4.1.3)
-
-  drop    !authenticated = *
-		  condition    = ${if eq{[$interface_address]}{$sender_helo_name}}
-          message       = $interface_address is _my_ address
-
-  accept
-
-
-acl_check_rcpt:
-  accept  hosts         = :
-
-# Limit per email account for SMTP auhenticated users
-  deny    message       = Email account $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period
-          set acl_c_msg_limit  = ${if exists{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{${lookup {$authenticated_id} lsearch{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{$value}{${readfile{/etc/exim4/limit.conf}}}}}{${readfile{/etc/exim4/limit.conf}}} }
-          ratelimit     = $acl_c_msg_limit / 1h / strict/ $authenticated_id
-
-  warn    ratelimit     = ${eval:$acl_c_msg_limit / 2} / 1h / strict / $authenticated_id
-  log_message           = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period
-
-  deny    message       = Restricted characters in address
-          domains       = +local_domains
-          local_parts   = ^[.] : ^.*[@%!/|]
-
-  deny    message       = Restricted characters in address
-          domains       = !+local_domains
-          local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
-
-  require verify        = sender
-
-  accept  hosts         = +relay_from_hosts
-          control       = submission
-
-  accept  authenticated = *
-          control       = submission/domain=
-
-  deny    message       = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
-          hosts         = !+whitelist
-          dnslists      = ${readfile {/etc/exim4/dnsbl.conf}{:}}
-
-  require message       = relay not permitted
-          domains       = +local_domains : +relay_to_domains
-
-  deny    message       = smtp auth required
-         sender_domains = +local_domains
-         !authenticated = *
-
-  require verify        = recipient
-
-.ifdef CLAMD
-  warn    set acl_m0    = no
-
-  warn    condition     = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}}
-          set acl_m0    = yes
-.endif
-
-.ifdef SPAMASSASSIN
- warn    set acl_m1    = no
-         set acl_m3    = no
- warn    condition     = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}}
-         set acl_m1    = yes
- warn    condition     = ${if exists {/etc/exim4/domains/$domain/reject_spam}{yes}{no}}
-         set acl_m3    = yes
-.endif
-
-  accept
-
-
-acl_check_data:
-.ifdef CLAMD
-  deny   message        = Message contains a virus ($malware_name) and has been rejected
-         malware        = */defer_ok
-         condition      = ${if eq{$acl_m0}{yes}{yes}{no}}
-.endif
-
-.ifdef SPAMASSASSIN
- warn   !authenticated = *
-        hosts          = !+relay_from_hosts
-        condition      = ${if < {$message_size}{1024K}}
-        condition      = ${if eq{$acl_m1}{yes}{yes}{no}}
-        spam           = debian-spamd:true/defer_ok
-        add_header     = X-Spam-Score: $spam_score_int
-        add_header     = X-Spam-Bar: $spam_bar
-        add_header     = X-Spam-Report: $spam_report
-        set acl_m2     = $spam_score_int
-
- warn   condition      = ${if !eq{$acl_m2}{} {yes}{no}}
-        condition      = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}}
-        add_header     = X-Spam-Status: Yes
-        message        = SpamAssassin detected spam (from $sender_address to $recipients).
-
-  # Deny spam at high score if spam score > SPAM_REJECT_SCORE and delete_spam is enabled
-  deny   message        = This message scored $spam_score spam points
-         spam           = debian-spamd:true
-         condition      = ${if eq{$acl_m3}{yes}{yes}{no}}
-         condition      = ${if >{$spam_score_int}{SPAM_REJECT_SCORE}{1}{0}}
-.endif
-
-  accept
-
-
-acl_check_mime:
-  deny   message        = Blacklisted file extension detected
-         condition      = ${if match {${lc:$mime_filename}}{\N(\.ace|\.ade|\.adp|\.app|\.arj|\.asp|\.aspx|\.asx|\.bas|\.bat|\.cab|\.cer|\.chm|\.cmd|\.cnt|\.com|\.cpl|\.crt|\.csh|\.der|\.diagcab|\.dll|\.efi|\.exe|\.fla|\.fon|\.fxp|\.gadget|\.grp|\.hlp|\.hpj|\.hta|\.htc|\.img|\.inf|\.ins|\.iso|\.isp|\.its|\.jar|\.jnlp|\.js|\.jse|\.ksh|\.lib|\.lnk|\.mad|\.maf|\.mag|\.mam|\.maq|\.mar|\.mas|\.mat|\.mau|\.mav|\.maw|\.mcf|\.mda|\.mdb|\.mde|\.mdt|\.mdw|\.mdz|\.msc|\.msh|\.msh1|\.msh1xml|\.msh2|\.msh2xml|\.mshxml|\.msi|\.msp|\.mst|\.msu|\.ops|\.osd|\.pcd|\.pif|\.pl|\.plg|\.prf|\.prg|\.printerexport|\.ps1|\.ps1xml|\.ps2|\.ps2xml|\.psc1|\.psc2|\.psd1|\.psdm1|\.pst|\.py|\.pyc|\.pyo|\.pyw|\.pyz|\.pyzw|\.reg|\.scf|\.scr|\.sct|\.sfx|\.shb|\.shs|\.swf|\.sys|\.theme|\.tmp|\.ttf|\.url|\.vb|\.vba|\.vbe|\.vbp|\.vbs|\.vhd|\.vhdx|\.vsmacros|\.vsw|\.vxd|\.webpnp|\.website|\.wim|\.ws|\.wsc|\.wsf|\.wsh|\.xbap|\.xll|\.xnk)$\N}{1}{0}}
-
-  accept
-
-
-
-######################################################################
-#                   AUTHENTICATION CONFIGURATION                     #
-######################################################################
-begin authenticators
-
-smtp_relay_login:
-  driver = plaintext
-  public_name = LOGIN
-  hide client_send = : SMTP_RELAY_USER : SMTP_RELAY_PASS
-
-dovecot_plain:
-  driver = dovecot
-  public_name = PLAIN
-  server_socket = /run/dovecot/auth-client
-  server_set_id = $auth1
-
-dovecot_login:
-  driver = dovecot
-  public_name = LOGIN
-  server_socket = /run/dovecot/auth-client
-  server_set_id = $auth1
-
-
-
-######################################################################
-#                      ROUTERS CONFIGURATION                         #
-#               Specifies how addresses are handled                  #
-######################################################################
-begin routers
-
-send_via_unauthenticated_smtp_relay:
-  driver = manualroute
-  address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT
-  domains = !+local_domains
-  require_files = SMTP_RELAY_FILE
-  condition = ${if eq{SMTP_RELAY_USER}{}}
-  transport = remote_smtp
-  route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}}
-  no_more
-  no_verify
-
-send_via_smtp_relay:
-  driver = manualroute
-  address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT
-  domains = !+local_domains
-  require_files = SMTP_RELAY_FILE
-  transport = smtp_relay_smtp
-  route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}}
-  no_more
-  no_verify
-
-dnslookup:
-  driver = dnslookup
-  domains = !+local_domains
-  transport = remote_smtp
-  no_more
-
-userforward:
-  driver = redirect
-  check_local_user
-  file = $home/.forward
-  require_files = ${local_part}:+${home}/.forward
-  domains = +local_domains
-  allow_filter
-  no_verify
-  no_expn
-  check_ancestor
-  file_transport = address_file
-  pipe_transport = address_pipe
-  reply_transport = address_reply
-
-procmail:
-  driver = accept
-  check_local_user
-  require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail
-  transport = procmail
-  no_verify
-
-autoreplay:
-  driver = accept
-  require_files = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg}{yes}{no}}
-  retry_use_local_part
-  transport = userautoreply
-  unseen
-
-aliases:
-  driver = redirect
-  headers_add = X-redirected: yes
-  data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}}
-  require_files = /etc/exim4/domains/$domain/aliases
-  redirect_router = dnslookup
-  pipe_transport = address_pipe
-  unseen
-
-localuser_fwd_only:
-  driver = accept
-  transport = devnull
-  condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/fwd_only}{true}{false}}}}
-
-localuser_spam:
-  driver = accept
-  transport = local_spam_delivery
-  condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{yes}{no_such_user}}}}
-
-localuser:
-  driver = accept
-  transport = local_delivery
-  condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{true}{false}}
-
-catchall:
-  driver = redirect
-  headers_add = X-redirected: yes
-  require_files = /etc/exim4/domains/$domain/aliases
-  data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}}
-  file_transport = local_delivery
-  redirect_router = dnslookup
-  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}
-
-terminate_alias:
-  driver = accept
-  transport = devnull
-  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}}
-
-######################################################################
-#                      TRANSPORTS CONFIGURATION                      #
-######################################################################
-begin transports
-
-smtp_relay_smtp:
-  driver = smtp
-  hosts_require_auth = $host_address
-  hosts_require_tls = $host_address
-
-remote_smtp:
-  driver = smtp
-  helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}}
-  dkim_domain = DKIM_DOMAIN
-  dkim_selector = mail
-  dkim_private_key = DKIM_PRIVATE_KEY
-  dkim_canon = relaxed
-  dkim_strict = 0
-  hosts_try_fastopen = !*.l.google.com
-  interface = ${if exists{OUTGOING_IP}{${readfile{OUTGOING_IP}}}}
-
-procmail:
-  driver = pipe
-  command = "/usr/bin/procmail -d $local_part"
-  return_path_add
-  delivery_date_add
-  envelope_to_add
-  user = $local_part
-  initgroups
-  return_output
-
-local_delivery:
-  driver = appendfile
-  maildir_format
-  maildir_use_size_file
-  user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}
-  group = mail
-  create_directory
-  directory_mode = 770
-  mode = 660
-  use_lockfile = no
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}"
-  quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M
-  quota_warn_threshold = 75%
-
-local_spam_delivery:
-  driver = appendfile
-  maildir_format
-  maildir_use_size_file
-  user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}
-  group = mail
-  create_directory
-  directory_mode = 770
-  mode = 660
-  use_lockfile = no
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}/.Spam"
-  quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M
-  quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}"
-  quota_warn_threshold = 75%
-
-address_pipe:
-  driver = pipe
-  return_output
-
-address_file:
-  driver = appendfile
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-
-address_reply:
-  driver = autoreply
-
-userautoreply:
-  driver = autoreply
-  file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg
-  from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}"
-  headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
-  subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
-  to = "${sender_address}"
-
-devnull:
-  driver = appendfile
-  file = /dev/null
-
-
-
-######################################################################
-#                      RETRY CONFIGURATION                           #
-######################################################################
-begin retry
-
-# Address or Domain    Error       Retries
-# -----------------    -----       -------
-*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,6h
-
-
-
-######################################################################
-#                      REWRITE CONFIGURATION                         #
-######################################################################
-begin rewrite
-
-
-
-######################################################################

install/deb/exim/exim4.conf.4.95.template

@@ -1,512 +0,0 @@
-######################################################################
-#                                                                    #
-#          Exim configuration file for Hestia Control Panel          #
-#                                                                    #
-######################################################################
-
-#SPAMASSASSIN = yes
-#SPAM_SCORE = 50
-#SPAM_REJECT_SCORE = 100
-#CLAMD = yes
-
-smtp_banner = $smtp_active_hostname
-smtp_active_hostname = ${lookup dnsdb{>: defer_never,ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}}
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
-disable_ipv6 = true
-
-SRS_SECRET = ${readfile{/etc/exim4/srs.conf}}
-
-smtputf8_advertise_hosts =
-domainlist local_domains = dsearch;/etc/exim4/domains/
-domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
-hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
-hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
-no_local_from_check
-untrusted_set_sender = *
-acl_smtp_connect = acl_check_spammers
-acl_smtp_mail = acl_check_mail
-acl_smtp_rcpt = acl_check_rcpt
-acl_smtp_data = acl_check_data
-acl_smtp_mime = acl_check_mime
-
-.ifdef SPAMASSASSIN
-spamd_address = 127.0.0.1 783
-.endif
-
-.ifdef CLAMD
-av_scanner = clamd: /run/clamav/clamd.ctl
-.endif
-
-log_selector = +tls_sni
-
-tls_advertise_hosts = *
-
-# We test that $tls_in_sni is a valid domain, by an arbitrary email address foo@domain.tld .
-# Then, we extract the domain with a function that would fail if the email address is invalid.
-# If the certificate exists, we will use it, otherwise the default certificate in /etc/ssl will be used.
-tls_certificate = \
-        ${if and {\
-                     { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\
-                     { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.crt} }\
-                 }\
-                 {/usr/local/hestia/ssl/mail/$tls_in_sni.crt}\
-                 {/usr/local/hestia/ssl/certificate.crt}\
-         }
-
-tls_privatekey = \
-        ${if and {\
-                     { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\
-                     { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.key} }\
-                 }\
-                 {/usr/local/hestia/ssl/mail/$tls_in_sni.key}\
-                 {/usr/local/hestia/ssl/certificate.key}\
-         }
-
-daemon_smtp_ports = 25 : 465 : 587
-tls_on_connect_ports = 465
-tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE
-never_users = root
-host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 0s
-ignore_bounce_errors_after = 2d
-timeout_frozen_after = 7d
-
-DKIM_DOMAIN = ${lc:${domain:$h_from:}}
-DKIM_FILE = /etc/exim4/domains/${lookup{${lc:${domain:$h_from:}}}dsearch{/etc/exim4/domains/}}/dkim.pem
-DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}}
-
-OUTGOING_IP = /etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/ip
-
-SMTP_RELAY_FILE = ${if exists{/etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/smtp_relay.conf}{/etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/smtp_relay.conf}{/etc/exim4/smtp_relay.conf}}
-SMTP_RELAY_HOST = ${lookup{host}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_PORT = ${lookup{port}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_USER = ${lookup{user}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_PASS = ${lookup{pass}lsearch{SMTP_RELAY_FILE}}
-
-# Custom Filter
-system_filter = /etc/exim4/system.filter
-system_filter_user = Debian-exim
-
-######################################################################
-#                       ACL CONFIGURATION                            #
-#         Specifies access control lists for incoming SMTP mail      #
-######################################################################
-
-acl_not_smtp = acl_not_smtp
-
-begin acl
-
-# Limit per user for PHP scripts
-acl_not_smtp:
-  deny    message       = Website of user $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period
-  ratelimit             = 200 / 1h / $authenticated_id
-
-  warn    ratelimit     = 100 / 1h / strict / $authenticated_id
-  log_message           = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period
-
-  accept
-
-acl_check_spammers:
-  accept  hosts         = +whitelist
-
-  drop    message       = Your host in blacklist on this server.
-          log_message   = Host in blacklist
-          hosts         = +spammers
-
-  accept
-
-
-acl_check_mail:
-	deny    condition     = ${if eq{$sender_helo_name}{}}
-			message       = HELO required before MAIL
-
-	drop    !authenticated = *
-			message       =  Helo name contains an IP address (HELO was $sender_helo_name) and not is valid
-			condition     = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}}
-			condition     = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}}
-			delay         = 45s
-
-	drop    !authenticated = *
-			condition     = ${if isip{$sender_helo_name}}
-			message       = Access denied - Invalid HELO name (See RFC2821 4.1.3)
-
-	drop    !authenticated = *
-			condition    = ${if eq{[$interface_address]}{$sender_helo_name}}
-			message       = $interface_address is _my_ address
-
-	accept
-
-
-acl_check_rcpt:
-  accept  hosts         = :
-
-# Limit per email account for SMTP auhenticated users
-  deny    message       = Email account $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period
-          set acl_c_msg_limit  = ${if exists{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{${lookup {$authenticated_id} lsearch{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{$value}{${readfile{/etc/exim4/limit.conf}}}}}{${readfile{/etc/exim4/limit.conf}}} }
-          ratelimit     = $acl_c_msg_limit / 1h / strict/ $authenticated_id
-
-  warn    ratelimit     = ${eval:$acl_c_msg_limit / 2} / 1h / strict / $authenticated_id
-  log_message           = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period
-
-  deny    message       = Restricted characters in address
-          domains       = +local_domains
-          local_parts   = ^[.] : ^.*[@%!/|]
-
-  deny    message       = Restricted characters in address
-          domains       = !+local_domains
-          local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
-
-  require verify        = sender
-
-  accept  hosts         = +relay_from_hosts
-          control       = submission
-
-  accept  authenticated = *
-          control       = submission/domain=
-
-  deny    message       = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
-          hosts         = !+whitelist
-          dnslists      = ${readfile {/etc/exim4/dnsbl.conf}{:}}
-
-  require message       = relay not permitted
-          domains       = +local_domains : +relay_to_domains
-
-  deny    message       = smtp auth required
-         sender_domains = +local_domains
-         !authenticated = *
-
-  require verify        = recipient
-
-.ifdef CLAMD
-  warn    set acl_m0    = no
-
-  warn    condition     = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}}
-          set acl_m0    = yes
-.endif
-
-.ifdef SPAMASSASSIN
- warn    set acl_m1    = no
-         set acl_m3    = no
- warn    condition     = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}}
-         set acl_m1    = yes
- warn    condition     = ${if exists {/etc/exim4/domains/$domain/reject_spam}{yes}{no}}
-         set acl_m3    = yes
-.endif
-
-  accept
-
-
-acl_check_data:
-.ifdef CLAMD
-  deny   message        = Message contains a virus ($malware_name) and has been rejected
-         malware        = */defer_ok
-         condition      = ${if eq{$acl_m0}{yes}{yes}{no}}
-.endif
-
-.ifdef SPAMASSASSIN
- warn   !authenticated = *
-        hosts          = !+relay_from_hosts
-        condition      = ${if < {$message_size}{1024K}}
-        condition      = ${if eq{$acl_m1}{yes}{yes}{no}}
-        spam           = debian-spamd:true/defer_ok
-        add_header     = X-Spam-Score: $spam_score_int
-        add_header     = X-Spam-Bar: $spam_bar
-        add_header     = X-Spam-Report: $spam_report
-        set acl_m2     = $spam_score_int
-
- warn   condition      = ${if !eq{$acl_m2}{} {yes}{no}}
-        condition      = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}}
-        add_header     = X-Spam-Status: Yes
-        message        = SpamAssassin detected spam (from $sender_address to $recipients).
-
-  # Deny spam at high score if spam score > SPAM_REJECT_SCORE and delete_spam is enabled
-  deny   message        = This message scored $spam_score spam points
-         spam           = debian-spamd:true
-         condition      = ${if eq{$acl_m3}{yes}{yes}{no}}
-         condition      = ${if >{$spam_score_int}{SPAM_REJECT_SCORE}{1}{0}}
-.endif
-
-  accept
-
-
-acl_check_mime:
-  deny   message        = Blacklisted file extension detected
-         condition      = ${if match {${lc:$mime_filename}}{\N(\.ace|\.ade|\.adp|\.app|\.arj|\.asp|\.aspx|\.asx|\.bas|\.bat|\.cab|\.cer|\.chm|\.cmd|\.cnt|\.com|\.cpl|\.crt|\.csh|\.der|\.diagcab|\.dll|\.efi|\.exe|\.fla|\.fon|\.fxp|\.gadget|\.grp|\.hlp|\.hpj|\.hta|\.htc|\.img|\.inf|\.ins|\.iso|\.isp|\.its|\.jar|\.jnlp|\.js|\.jse|\.ksh|\.lib|\.lnk|\.mad|\.maf|\.mag|\.mam|\.maq|\.mar|\.mas|\.mat|\.mau|\.mav|\.maw|\.mcf|\.mda|\.mdb|\.mde|\.mdt|\.mdw|\.mdz|\.msc|\.msh|\.msh1|\.msh1xml|\.msh2|\.msh2xml|\.mshxml|\.msi|\.msp|\.mst|\.msu|\.ops|\.osd|\.pcd|\.pif|\.pl|\.plg|\.prf|\.prg|\.printerexport|\.ps1|\.ps1xml|\.ps2|\.ps2xml|\.psc1|\.psc2|\.psd1|\.psdm1|\.pst|\.py|\.pyc|\.pyo|\.pyw|\.pyz|\.pyzw|\.reg|\.scf|\.scr|\.sct|\.sfx|\.shb|\.shs|\.swf|\.sys|\.theme|\.tmp|\.ttf|\.url|\.vb|\.vba|\.vbe|\.vbp|\.vbs|\.vhd|\.vhdx|\.vsmacros|\.vsw|\.vxd|\.webpnp|\.website|\.wim|\.ws|\.wsc|\.wsf|\.wsh|\.xbap|\.xll|\.xnk)$\N}{1}{0}}
-
-  accept
-
-
-
-######################################################################
-#                   AUTHENTICATION CONFIGURATION                     #
-######################################################################
-begin authenticators
-
-smtp_relay_login:
-  driver = plaintext
-  public_name = LOGIN
-  hide client_send = : SMTP_RELAY_USER : SMTP_RELAY_PASS
-
-dovecot_plain:
-  driver = dovecot
-  public_name = PLAIN
-  server_socket = /run/dovecot/auth-client
-  server_set_id = $auth1
-
-dovecot_login:
-  driver = dovecot
-  public_name = LOGIN
-  server_socket = /run/dovecot/auth-client
-  server_set_id = $auth1
-
-
-
-######################################################################
-#                      ROUTERS CONFIGURATION                         #
-#               Specifies how addresses are handled                  #
-######################################################################
-begin routers
-
-send_via_unauthenticated_smtp_relay:
-  driver = manualroute
-  address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT
-  domains = !+local_domains
-  require_files = SMTP_RELAY_FILE
-  condition = ${if eq{SMTP_RELAY_USER}{}}
-  transport = remote_smtp
-  route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}}
-  no_more
-  no_verify
-
-send_via_smtp_relay:
-  driver = manualroute
-  address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT
-  domains = !+local_domains
-  require_files = SMTP_RELAY_FILE
-  transport = smtp_relay_smtp
-  route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}}
-  no_more
-  no_verify
-
-dnslookup:
-  driver = dnslookup
-  # if outbound, and forwarding has been done, use an alternate transport
-  domains = ! +local_domains
-  transport = ${if eq {$local_part@$domain} \
-                      {$original_local_part@$original_domain} \
-                      {remote_smtp} {remote_forwarded_smtp}}
-  no_more
-
-userforward:
-  driver = redirect
-  check_local_user
-  file = $home/.forward
-  require_files = ${local_part}:+${home}/.forward
-  domains = +local_domains
-  allow_filter
-  no_verify
-  no_expn
-  check_ancestor
-  file_transport = address_file
-  pipe_transport = address_pipe
-  reply_transport = address_reply
-
-procmail:
-  driver = accept
-  check_local_user
-  require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail
-  transport = procmail
-  no_verify
-
-autoreplay:
-  driver = accept
-  require_files = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg}{yes}{no}}
-  retry_use_local_part
-  transport = userautoreply
-  unseen
-
-inbound_srs:
-    driver = redirect
-    senders = :
-    domains = +local_domains
-    # detect inbound bounces which are SRS'd, and decode them
-    condition = ${if inbound_srs {$local_part} {SRS_SECRET}}
-    data = $srs_recipient
-
-inbound_srs_failure:
-    driver = redirect
-    senders = :
-    domains = +local_domains
-    # detect inbound bounces which look SRS'd but are invalid
-    condition = ${if inbound_srs {$local_part} {}}
-    allow_fail
-    data = :fail: Invalid SRS recipient address
-
-aliases:
-  driver = redirect
-  headers_add = X-redirected: yes
-  data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}}
-  require_files = /etc/exim4/domains/$domain/aliases
-  redirect_router = dnslookup
-  pipe_transport = address_pipe
-  unseen
-
-localuser_fwd_only:
-  driver = accept
-  transport = devnull
-  condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/fwd_only}{true}{false}}}}
-
-localuser_spam:
-  driver = accept
-  transport = local_spam_delivery
-  condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{yes}{no_such_user}}}}
-
-localuser:
-  driver = accept
-  transport = local_delivery
-  condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{true}{false}}
-
-catchall:
-  driver = redirect
-  headers_add = X-redirected: yes
-  require_files = /etc/exim4/domains/$domain/aliases
-  data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}}
-  file_transport = local_delivery
-  redirect_router = dnslookup
-  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}
-
-terminate_alias:
-  driver = accept
-  transport = devnull
-  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}}
-
-######################################################################
-#                      TRANSPORTS CONFIGURATION                      #
-######################################################################
-begin transports
-
-smtp_relay_smtp:
-  driver = smtp
-  hosts_require_auth = $host_address
-  hosts_require_tls = $host_address
-
-remote_smtp:
-  driver = smtp
-  helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}}
-  dkim_domain = DKIM_DOMAIN
-  dkim_selector = mail
-  dkim_private_key = DKIM_PRIVATE_KEY
-  dkim_canon = relaxed
-  dkim_strict = 0
-  hosts_try_fastopen = !*.l.google.com
-  interface = ${if exists{OUTGOING_IP}{${readfile{OUTGOING_IP}}}}
-
-remote_forwarded_smtp:
-  driver = smtp
-  helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}}
-  dkim_domain = DKIM_DOMAIN
-  dkim_selector = mail
-  dkim_private_key = DKIM_PRIVATE_KEY
-  dkim_canon = relaxed
-  dkim_strict = 0
-  hosts_try_fastopen = !*.l.google.com
-  interface = ${if exists{OUTGOING_IP}{${readfile{OUTGOING_IP}}}}
-  # modify the envelope from, for mails that we forward
-  max_rcpt = 1
-  return_path = ${srs_encode {SRS_SECRET} {$return_path} {$original_domain}}
-
-procmail:
-  driver = pipe
-  command = "/usr/bin/procmail -d $local_part"
-  return_path_add
-  delivery_date_add
-  envelope_to_add
-  user = $local_part
-  initgroups
-  return_output
-
-local_delivery:
-  driver = appendfile
-  maildir_format
-  maildir_use_size_file
-  user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}
-  group = mail
-  create_directory
-  directory_mode = 770
-  mode = 660
-  use_lockfile = no
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}"
-  quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M
-  quota_warn_threshold = 75%
-
-local_spam_delivery:
-  driver = appendfile
-  maildir_format
-  maildir_use_size_file
-  user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}
-  group = mail
-  create_directory
-  directory_mode = 770
-  mode = 660
-  use_lockfile = no
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}/.Spam"
-  quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M
-  quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}"
-  quota_warn_threshold = 75%
-
-address_pipe:
-  driver = pipe
-  return_output
-
-address_file:
-  driver = appendfile
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-
-address_reply:
-  driver = autoreply
-
-userautoreply:
-  driver = autoreply
-  file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg
-  from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}"
-  headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
-  subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
-  to = "${sender_address}"
-
-devnull:
-  driver = appendfile
-  file = /dev/null
-
-
-
-######################################################################
-#                      RETRY CONFIGURATION                           #
-######################################################################
-begin retry
-
-# Address or Domain    Error       Retries
-# -----------------    -----       -------
-*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,6h
-
-
-
-######################################################################
-#                      REWRITE CONFIGURATION                         #
-######################################################################
-begin rewrite
-
-
-
-######################################################################

install/deb/exim/exim4.conf.template

@@ -1,478 +0,0 @@
-######################################################################
-#                                                                    #
-#          Exim configuration file for Hestia Control Panel          #
-#                                                                    #
-######################################################################
-
-#SPAMASSASSIN = yes
-#SPAM_SCORE = 50
-#SPAM_REJECT_SCORE = 100
-#CLAMD = yes
-
-smtp_banner = $smtp_active_hostname
-smtp_active_hostname = ${lookup dnsdb{>: defer_never,ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}}
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
-disable_ipv6 = true
-
-smtputf8_advertise_hosts =
-domainlist local_domains = dsearch;/etc/exim4/domains/
-domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
-hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
-hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
-no_local_from_check
-untrusted_set_sender = *
-acl_smtp_connect = acl_check_spammers
-acl_smtp_mail = acl_check_mail
-acl_smtp_rcpt = acl_check_rcpt
-acl_smtp_data = acl_check_data
-acl_smtp_mime = acl_check_mime
-
-.ifdef SPAMASSASSIN
-spamd_address = 127.0.0.1 783
-.endif
-
-.ifdef CLAMD
-av_scanner = clamd: /run/clamav/clamd.ctl
-.endif
-
-log_selector = +tls_sni
-
-tls_advertise_hosts = *
-
-# We test that $tls_in_sni is a valid domain, by an arbitrary email address foo@domain.tld .
-# Then, we extract the domain with a function that would fail if the email address is invalid.
-# If the certificate exists, we will use it, otherwise the default certificate in /etc/ssl will be used.
-tls_certificate = \
-        ${if and {\
-                     { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\
-                     { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.crt} }\
-                 }\
-                 {/usr/local/hestia/ssl/mail/$tls_in_sni.crt}\
-                 {/usr/local/hestia/ssl/certificate.crt}\
-         }
-
-tls_privatekey = \
-        ${if and {\
-                     { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\
-                     { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.key} }\
-                 }\
-                 {/usr/local/hestia/ssl/mail/$tls_in_sni.key}\
-                 {/usr/local/hestia/ssl/certificate.key}\
-         }
-
-daemon_smtp_ports = 25 : 465 : 587
-tls_on_connect_ports = 465
-tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE
-never_users = root
-host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 0s
-ignore_bounce_errors_after = 2d
-timeout_frozen_after = 7d
-
-DKIM_DOMAIN = ${lc:${domain:$h_from:}}
-DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
-DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}}
-
-OUTGOING_IP = /etc/exim4/domains/$sender_address_domain/ip
-
-SMTP_RELAY_FILE = ${if exists{/etc/exim4/domains/${sender_address_domain}/smtp_relay.conf}{/etc/exim4/domains/$sender_address_domain/smtp_relay.conf}{/etc/exim4/smtp_relay.conf}}
-SMTP_RELAY_HOST = ${lookup{host}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_PORT = ${lookup{port}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_USER = ${lookup{user}lsearch{SMTP_RELAY_FILE}}
-SMTP_RELAY_PASS = ${lookup{pass}lsearch{SMTP_RELAY_FILE}}
-
-# Custom Filter
-system_filter = /etc/exim4/system.filter
-system_filter_user = Debian-exim
-
-######################################################################
-#                       ACL CONFIGURATION                            #
-#         Specifies access control lists for incoming SMTP mail      #
-######################################################################
-
-acl_not_smtp = acl_not_smtp
-
-begin acl
-
-# Limit per user for PHP scripts
-acl_not_smtp:
-  deny    message       = Website of user $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period
-  ratelimit             = 200 / 1h / $authenticated_id
-
-  warn    ratelimit     = 100 / 1h / strict / $authenticated_id
-  log_message           = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period
-
-  accept
-
-acl_check_spammers:
-  accept  hosts         = +whitelist
-
-  drop    message       = Your host in blacklist on this server.
-          log_message   = Host in blacklist
-          hosts         = +spammers
-
-  accept
-
-
-acl_check_mail:
-  deny  condition     = ${if eq{$sender_helo_name}{}}
-        message       = HELO required before MAIL
-
-  drop  !authenticated = *
-		message       =  Helo name contains an IP address (HELO was $sender_helo_name) and not is valid
-		condition     = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}}
-		condition     = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}}
-		delay         = 45s
-
-  drop  !authenticated = *
-		condition     = ${if isip{$sender_helo_name}}
-		message       = Access denied - Invalid HELO name (See RFC2821 4.1.3)
-
-  drop  !authenticated = *
-		condition    = ${if eq{[$interface_address]}{$sender_helo_name}}
-		message       = $interface_address is _my_ address
-
-  accept
-
-
-acl_check_rcpt:
-  accept  hosts         = :
-
-# Limit per email account for SMTP auhenticated users
-  deny    message       = Email account $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period
-      set acl_c_msg_limit  = ${if exists{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{${lookup {$authenticated_id} lsearch{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{$value}{${readfile{/etc/exim4/limit.conf}}}}}{${readfile{/etc/exim4/limit.conf}}} }
-          ratelimit     = $acl_c_msg_limit / 1h / strict/ $authenticated_id
-
-  warn    ratelimit     = ${eval:$acl_c_msg_limit / 2} / 1h / strict / $authenticated_id
-          log_message           = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period
-
-  deny    message       = Restricted characters in address
-          domains       = +local_domains
-          local_parts   = ^[.] : ^.*[@%!/|]
-
-  deny    message       = Restricted characters in address
-          domains       = !+local_domains
-          local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
-
-  require verify        = sender
-
-  accept  hosts         = +relay_from_hosts
-          control       = submission
-
-  accept  authenticated = *
-          control       = submission/domain=
-
-  deny    message       = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
-          hosts         = !+whitelist
-          dnslists      = ${readfile {/etc/exim4/dnsbl.conf}{:}}
-
-  require message       = relay not permitted
-          domains       = +local_domains : +relay_to_domains
-
-  deny    message       = smtp auth required
-         sender_domains = +local_domains
-         !authenticated = *
-
-  require verify        = recipient
-
-.ifdef CLAMD
-  warn    set acl_m0    = no
-
-  warn    condition     = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}}
-          set acl_m0    = yes
-.endif
-
-.ifdef SPAMASSASSIN
-  warn    set acl_m1    = no
-          set acl_m3    = no
-  warn    condition     = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}}
-          set acl_m1    = yes
-  warn    condition     = ${if exists {/etc/exim4/domains/$domain/reject_spam}{yes}{no}}
-          set acl_m3    = yes
-.endif
-
-
-  accept
-
-
-acl_check_data:
-.ifdef CLAMD
-  deny   message        = Message contains a virus ($malware_name) and has been rejected
-         malware        = */defer_ok
-         condition      = ${if eq{$acl_m0}{yes}{yes}{no}}
-.endif
-
-.ifdef SPAMASSASSIN
-  warn   !authenticated = *
-         hosts          = !+relay_from_hosts
-         condition      = ${if < {$message_size}{1024K}}
-         condition      = ${if eq{$acl_m1}{yes}{yes}{no}}
-         spam           = debian-spamd:true/defer_ok
-         add_header     = X-Spam-Score: $spam_score_int
-         add_header     = X-Spam-Bar: $spam_bar
-         add_header     = X-Spam-Report: $spam_report
-         set acl_m2     = $spam_score_int
-
-  warn   condition      = ${if !eq{$acl_m2}{} {yes}{no}}
-         condition      = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}}
-         add_header     = X-Spam-Status: Yes
-         message        = SpamAssassin detected spam (from $sender_address to $recipients).
-
-  # Deny spam at high score if spam score > SPAM_REJECT_SCORE and delete_spam is enabled
-  deny   message        = This message scored $spam_score spam points
-         spam           = debian-spamd:true
-         condition      = ${if eq{$acl_m3}{yes}{yes}{no}}
-         condition      = ${if >{$spam_score_int}{SPAM_REJECT_SCORE}{1}{0}}
-.endif
-
-
-  accept
-
-
-acl_check_mime:
-  deny   message        = Blacklisted file extension detected
-         condition      = ${if match {${lc:$mime_filename}}{\N(\.ace|\.ade|\.adp|\.app|\.arj|\.asp|\.aspx|\.asx|\.bas|\.bat|\.cab|\.cer|\.chm|\.cmd|\.cnt|\.com|\.cpl|\.crt|\.csh|\.der|\.diagcab|\.dll|\.efi|\.exe|\.fla|\.fon|\.fxp|\.gadget|\.grp|\.hlp|\.hpj|\.hta|\.htc|\.img|\.inf|\.ins|\.iso|\.isp|\.its|\.jar|\.jnlp|\.js|\.jse|\.ksh|\.lib|\.lnk|\.mad|\.maf|\.mag|\.mam|\.maq|\.mar|\.mas|\.mat|\.mau|\.mav|\.maw|\.mcf|\.mda|\.mdb|\.mde|\.mdt|\.mdw|\.mdz|\.msc|\.msh|\.msh1|\.msh1xml|\.msh2|\.msh2xml|\.mshxml|\.msi|\.msp|\.mst|\.msu|\.ops|\.osd|\.pcd|\.pif|\.pl|\.plg|\.prf|\.prg|\.printerexport|\.ps1|\.ps1xml|\.ps2|\.ps2xml|\.psc1|\.psc2|\.psd1|\.psdm1|\.pst|\.py|\.pyc|\.pyo|\.pyw|\.pyz|\.pyzw|\.reg|\.scf|\.scr|\.sct|\.sfx|\.shb|\.shs|\.swf|\.sys|\.theme|\.tmp|\.ttf|\.url|\.vb|\.vba|\.vbe|\.vbp|\.vbs|\.vhd|\.vhdx|\.vsmacros|\.vsw|\.vxd|\.webpnp|\.website|\.wim|\.ws|\.wsc|\.wsf|\.wsh|\.xbap|\.xll|\.xnk)$\N}{1}{0}}
-
-  accept
-
-
-
-######################################################################
-#                   AUTHENTICATION CONFIGURATION                     #
-######################################################################
-begin authenticators
-
-smtp_relay_login:
-  driver = plaintext
-  public_name = LOGIN
-  hide client_send = : SMTP_RELAY_USER : SMTP_RELAY_PASS
-
-dovecot_plain:
-  driver = dovecot
-  public_name = PLAIN
-  server_socket = /run/dovecot/auth-client
-  server_set_id = $auth1
-
-dovecot_login:
-  driver = dovecot
-  public_name = LOGIN
-  server_socket = /run/dovecot/auth-client
-  server_set_id = $auth1
-
-
-
-######################################################################
-#                      ROUTERS CONFIGURATION                         #
-#               Specifies how addresses are handled                  #
-######################################################################
-begin routers
-
-send_via_unauthenticated_smtp_relay:
-  driver = manualroute
-  address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT
-  domains = !+local_domains
-  require_files = SMTP_RELAY_FILE
-  condition = ${if eq{SMTP_RELAY_USER}{}}
-  transport = remote_smtp
-  route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}}
-  no_more
-  no_verify
-
-send_via_smtp_relay:
-  driver = manualroute
-  address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT
-  domains = !+local_domains
-  require_files = SMTP_RELAY_FILE
-  transport = smtp_relay_smtp
-  route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}}
-  no_more
-  no_verify
-
-dnslookup:
-  driver = dnslookup
-  domains = !+local_domains
-  transport = remote_smtp
-  no_more
-
-userforward:
-  driver = redirect
-  check_local_user
-  file = $home/.forward
-  require_files = ${local_part}:+${home}/.forward
-  domains = +local_domains
-  allow_filter
-  no_verify
-  no_expn
-  check_ancestor
-  file_transport = address_file
-  pipe_transport = address_pipe
-  reply_transport = address_reply
-
-procmail:
-  driver = accept
-  check_local_user
-  require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail
-  transport = procmail
-  no_verify
-
-autoreplay:
-  driver = accept
-  require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
-  retry_use_local_part
-  transport = userautoreply
-  unseen
-
-aliases:
-  driver = redirect
-  headers_add = X-redirected: yes
-  data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}}
-  require_files = /etc/exim4/domains/$domain/aliases
-  redirect_router = dnslookup
-  pipe_transport = address_pipe
-  unseen
-
-localuser_fwd_only:
-  driver = accept
-  transport = devnull
-  condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}}
-
-localuser_spam:
-  driver = accept
-  transport = local_spam_delivery
-  condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}}
-
-localuser:
-  driver = accept
-  transport = local_delivery
-  condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}}
-
-catchall:
-  driver = redirect
-  headers_add = X-redirected: yes
-  require_files = /etc/exim4/domains/$domain/aliases
-  data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}}
-  file_transport = local_delivery
-  redirect_router = dnslookup
-  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}
-
-terminate_alias:
-  driver = accept
-  transport = devnull
-  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}}
-
-######################################################################
-#                      TRANSPORTS CONFIGURATION                      #
-######################################################################
-begin transports
-
-smtp_relay_smtp:
-  driver = smtp
-  hosts_require_auth = $host_address
-  hosts_require_tls = $host_address
-
-remote_smtp:
-  driver = smtp
-  helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}}
-  dkim_domain = DKIM_DOMAIN
-  dkim_selector = mail
-  dkim_private_key = DKIM_PRIVATE_KEY
-  dkim_canon = relaxed
-  dkim_strict = 0
-  hosts_try_fastopen = !*.l.google.com
-  interface = ${if exists{OUTGOING_IP}{${readfile{OUTGOING_IP}}}}
-
-procmail:
-  driver = pipe
-  command = "/usr/bin/procmail -d $local_part"
-  return_path_add
-  delivery_date_add
-  envelope_to_add
-  user = $local_part
-  initgroups
-  return_output
-
-local_delivery:
-  driver = appendfile
-  maildir_format
-  maildir_use_size_file
-  user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}
-  group = mail
-  create_directory
-  directory_mode = 770
-  mode = 660
-  use_lockfile = no
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part"
-  quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M
-  quota_warn_threshold = 75%
-
-local_spam_delivery:
-  driver = appendfile
-  maildir_format
-  maildir_use_size_file
-  user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}
-  group = mail
-  create_directory
-  directory_mode = 770
-  mode = 660
-  use_lockfile = no
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam"
-  quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M
-  quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part"
-  quota_warn_threshold = 75%
-
-address_pipe:
-  driver = pipe
-  return_output
-
-address_file:
-  driver = appendfile
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-
-address_reply:
-  driver = autoreply
-
-userautoreply:
-  driver = autoreply
-  file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  from = "${local_part}@${domain}"
-  headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
-  subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
-  to = "${sender_address}"
-
-devnull:
-  driver = appendfile
-  file = /dev/null
-
-
-
-######################################################################
-#                      RETRY CONFIGURATION                           #
-######################################################################
-begin retry
-
-# Address or Domain    Error       Retries
-# -----------------    -----       -------
-*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,6h
-
-
-
-######################################################################
-#                      REWRITE CONFIGURATION                         #
-######################################################################
-begin rewrite
-
-
-
-######################################################################

install/deb/exim/limit.conf

@@ -1 +0,0 @@
-200

install/deb/exim/srs.conf

@@ -1 +0,0 @@
-TOBEREPLACED

install/deb/exim/system.filter

@@ -1,16 +0,0 @@
-if $h_X-Spam-Status: contains "Yes"
-then
-    headers add "Old-Subject: $h_subject"
-    headers remove "Subject"
-    headers add "Subject: *** SPAM *** $h_old-subject"
-    headers remove "Old-Subject"
-endif
-
-# X-Anti-Virus: infected
-if $h_X-Anti-Virus: contains "infected"
-then
-    headers add "Old-Subject: $h_subject"
-    headers remove "Subject"
-    headers add "Subject: *** VIRUS *** $h_old-subject"
-    headers remove "Old-Subject"
-endif

install/deb/fail2ban/action.d/hestia.conf

@@ -1,9 +0,0 @@
-# Fail2Ban configuration file for hestia
-
-[Definition]
-
-actionstart = /usr/local/hestia/bin/v-add-firewall-chain <name>
-actionstop = /usr/local/hestia/bin/v-delete-firewall-chain <name>
-actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-<name>[ \t]'
-actionban = /usr/local/hestia/bin/v-add-firewall-ban <ip> <name>
-actionunban = /usr/local/hestia/bin/v-delete-firewall-ban <ip> <name>

install/deb/fail2ban/filter.d/hestia.conf

@@ -1,10 +0,0 @@
-# Fail2Ban filter for unsuccessful hestia authentication attempts
-#
-
-[INCLUDES]
-before = common.conf
-
-[Definition]
-failregex =  .* <HOST> failed to login
-ignoreregex =
-

install/deb/fail2ban/jail.local

@@ -1,66 +0,0 @@
-[ssh-iptables]
-enabled  = true
-filter   = sshd
-action   = hestia[name=SSH]
-logpath  = /var/log/auth.log
-maxretry = 5
-
-[vsftpd-iptables]
-enabled  = false
-filter   = vsftpd
-action   = hestia[name=FTP]
-logpath  = /var/log/vsftpd.log
-maxretry = 5
-
-[exim-iptables]
-enabled  = true
-filter   = exim
-action   = hestia[name=MAIL]
-logpath  = /var/log/exim4/mainlog
-
-[dovecot-iptables]
-enabled  = true
-filter   = dovecot
-action   = hestia[name=MAIL]
-logpath  = /var/log/dovecot.log
-
-[mysqld-iptables]
-enabled  = false
-filter   = mysqld-auth
-action   = hestia[name=DB]
-logpath  = /var/log/mysql/error.log
-maxretry = 5
-
-[hestia-iptables]
-enabled  = true
-filter   = hestia
-action   = hestia[name=HESTIA]
-logpath  = /var/log/hestia/auth.log
-maxretry = 5
-
-[roundcube-auth]
-enabled  = false
-filter   = roundcube-auth
-action   = hestia[name=WEB]
-logpath  = /var/log/roundcube/errors.log
-maxretry = 5
-
-[phpmyadmin-auth]
-enabled  = true
-filter   = phpmyadmin-syslog
-action   = hestia[name=WEB]
-logpath  = /var/log/auth.log
-maxretry = 5
-
-[recidive]
-enabled  = true
-filter   = recidive
-action   = hestia[name=RECIDIVE]
-logpath  = /var/log/fail2ban.log
-maxretry = 5
-findtime = 86400
-bantime  = 864000
-
-#Uncomment and add your IPs and or domains to the Whitelist
-#[DEFAULT]
-#ignoreip = 111.111.111.111 222.222.222.222 subdomain.example.tld example.tld 333.333.333.333

install/deb/filemanager/filegator/backend/Services/Archiver/Adapters/HestiaZipArchiver.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace Filegator\Services\Archiver\Adapters;
-
-use Filegator\Container\Container;
-use Filegator\Services\Archiver\ArchiverInterface;
-use Filegator\Services\Service;
-use Filegator\Services\Storage\Filesystem as Storage;
-use Filegator\Services\Tmpfs\TmpfsInterface;
-use function Hestiacp\quoteshellarg\quoteshellarg;
-
-class HestiaZipArchiver extends ZipArchiver implements Service, ArchiverInterface {
-	protected $container;
-
-	public function __construct(TmpfsInterface $tmpfs, Container $container) {
-		$this->tmpfs = $tmpfs;
-		$this->container = $container;
-	}
-
-	public function uncompress(string $source, string $destination, Storage $storage) {
-		$auth = $this->container->get("Filegator\Services\Auth\AuthInterface");
-
-		$v_user = basename($auth->user()->getUsername());
-
-		if (!strlen($v_user)) {
-			return;
-		}
-
-		if (strpos($source, "/home") === false) {
-			$source = "/home/$v_user/" . $source;
-		}
-
-		if (strpos($destination, "/home") === false) {
-			$destination = "/home/$v_user/" . $destination;
-		}
-
-		exec(
-			"sudo /usr/local/hestia/bin/v-extract-fs-archive " .
-				quoteshellarg($v_user) .
-				" " .
-				quoteshellarg($source) .
-				" " .
-				quoteshellarg($destination),
-			$output,
-			$return_var,
-		);
-	}
-}

install/deb/filemanager/filegator/backend/Services/Auth/Adapters/HestiaAuth.php

@@ -1,122 +0,0 @@
-<?php
-
-/*
- * This file is part of the FileGator package.
- *
- * (c) Milos Stojanovic <alcalbg@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE file
- */
-
-namespace Filegator\Services\Auth\Adapters;
-
-use Filegator\Services\Auth\AuthInterface;
-use Filegator\Services\Auth\User;
-use Filegator\Services\Auth\UsersCollection;
-use Filegator\Services\Service;
-use function Hestiacp\quoteshellarg\quoteshellarg;
-
-/**
- * @codeCoverageIgnore
- */
-class HestiaAuth implements Service, AuthInterface {
-	protected $permissions = [];
-
-	protected $private_repos = false;
-
-	protected $hestia_user = "";
-
-	public function init(array $config = []) {
-		if (isset($_SESSION["user"])) {
-			$v_user = $_SESSION["user"];
-		}
-		if (!empty($_SESSION["look"])) {
-			if (isset($_SESSION["look"]) && $_SESSION["userContext"] === "admin") {
-				$v_user = $_SESSION["look"];
-			}
-			if (
-				$_SESSION["look"] == "admin" &&
-				$_SESSION["POLICY_SYSTEM_PROTECTED_ADMIN"] == "yes"
-			) {
-				// Go away do not login
-				header("Location: /");
-				exit();
-			}
-		}
-		$this->hestia_user = $v_user;
-		$this->permissions = isset($config["permissions"]) ? (array) $config["permissions"] : [];
-		$this->private_repos = isset($config["private_repos"])
-			? (bool) $config["private_repos"]
-			: false;
-	}
-
-	public function user(): ?User {
-		$cmd = "/usr/bin/sudo /usr/local/hestia/bin/v-list-user";
-		exec($cmd . " " . quoteshellarg($this->hestia_user) . " json", $output, $return_var);
-
-		if ($return_var == 0) {
-			$data = json_decode(implode("", $output), true);
-			$hestia_user_info = $data[$this->hestia_user];
-			return $this->transformUser($hestia_user_info);
-		}
-
-		return $this->getGuest();
-	}
-
-	public function transformUser($hstuser): User {
-		$user = new User();
-		$user->setUsername($this->hestia_user);
-		$user->setName($this->hestia_user . " (" . $hstuser["NAME"] . ")");
-		$user->setRole("user");
-		$user->setPermissions($this->permissions);
-		$user->setHomedir("/");
-		return $user;
-	}
-
-	public function authenticate($username, $password): bool {
-		# Auth is handled by Hestia
-		return false;
-	}
-
-	public function forget() {
-		// Logout return to Hestia
-		return $this->getGuest();
-	}
-
-	public function store(User $user) {
-		return null; // not used
-	}
-
-	public function update($username, User $user, $password = ""): User {
-		// Password change is handled by Hestia
-		return $this->user();
-	}
-
-	public function add(User $user, $password): User {
-		return new User(); // not used
-	}
-
-	public function delete(User $user) {
-		return true; // not used
-	}
-
-	public function find($username): ?User {
-		return null; // not used
-	}
-
-	public function allUsers(): UsersCollection {
-		return new UsersCollection(); // not used
-	}
-
-	public function getGuest(): User {
-		$guest = new User();
-
-		$guest->setUsername("guest");
-		$guest->setName("Guest");
-		$guest->setRole("guest");
-		$guest->setHomedir("/");
-		$guest->setPermissions([]);
-
-		return $guest;
-	}
-}

install/deb/filemanager/filegator/backend/Services/Session/Adapters/SessionStorage.php

@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of the FileGator package.
- *
- * (c) Milos Stojanovic <alcalbg@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE file
- */
-
-namespace Filegator\Services\Session\Adapters;
-
-use Filegator\Kernel\Request;
-use Filegator\Services\Service;
-use Filegator\Services\Session\Session;
-use Filegator\Services\Session\SessionStorageInterface;
-
-class SessionStorage implements Service, SessionStorageInterface {
-	protected $request;
-
-	protected $config;
-
-	public function __construct(Request $request) {
-		$this->request = $request;
-	}
-
-	public function init(array $config = []) {
-		// we don't have a previous session attached
-		if (!$this->getSession()) {
-			$handler = $config["handler"];
-			$session = new Session($handler());
-			//$session->setName('filegator');
-			$this->setSession($session);
-		}
-	}
-
-	public function save() {
-		$this->getSession()->save();
-	}
-
-	public function set(string $key, $data) {
-		return $this->getSession()->set($key, $data);
-	}
-
-	public function get(string $key, $default = null) {
-		return $this->getSession() ? $this->getSession()->get($key, $default) : $default;
-	}
-
-	public function invalidate() {
-		if (!$this->getSession()->isStarted()) {
-			$this->getSession()->start();
-		}
-
-		$this->getSession()->invalidate();
-	}
-
-	private function setSession(Session $session) {
-		return $this->request->setSession($session);
-	}
-
-	private function getSession(): ?Session {
-		return $this->request->getSession();
-	}
-}

install/deb/filemanager/filegator/composer.json

@@ -1,47 +0,0 @@
-{
-	"name": "filegator/filegator",
-	"description": "Filegator",
-	"license": "MIT",
-	"type": "project",
-	"config": {
-		"platform": {
-			"php": "7.2.5"
-		}
-	},
-	"require": {
-		"php": "^7.2",
-		"monolog/monolog": "^1.24",
-		"nikic/fast-route": "^1.3",
-		"symfony/security-csrf": "^4.4",
-		"symfony/http-foundation": "^4.4",
-		"dibi/dibi": "^4.1",
-		"php-di/php-di": "^6.0",
-		"rakit/validation": "^1.1",
-		"league/flysystem": "^1.1",
-		"league/flysystem-ziparchive": "^1.0",
-		"league/flysystem-sftp": "^1.0",
-		"hestiacp/phpquoteshellarg": "^1.0"
-	},
-	"authors": [
-		{
-			"name": "Milos Stojanovic",
-			"email": "alcalbg@gmail.com"
-		}
-	],
-	"autoload": {
-		"psr-4": {
-			"Filegator\\": "backend"
-		}
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"Tests\\": "tests/backend/"
-		}
-	},
-	"require-dev": {
-		"phpunit/phpunit": "^8.0",
-		"symfony/var-dumper": "^4.4",
-		"league/flysystem-memory": "^1.0",
-		"phpstan/phpstan": "^0.11.8"
-	}
-}

install/deb/filemanager/filegator/configuration.php

@@ -1,175 +0,0 @@
-<?php
-use function Hestiacp\quoteshellarg\quoteshellarg;
-
-$dist_config = require __DIR__ . "/configuration_sample.php";
-
-$dist_config["public_path"] = "/fm/";
-$dist_config["frontend_config"]["app_name"] = "File Manager - Hestia Control Panel";
-$dist_config["frontend_config"]["logo"] = "../images/logo.svg";
-$dist_config["frontend_config"]["editable"] = [
-	".txt",
-	".css",
-	".js",
-	".ts",
-	".html",
-	".php",
-	".py",
-	".yml",
-	".xml",
-	".md",
-	".log",
-	".csv",
-	".conf",
-	".config",
-	".ini",
-	".scss",
-	".sh",
-	".env",
-	".example",
-	".htaccess",
-	".twig",
-	".tpl",
-	".yaml",
-];
-$dist_config["frontend_config"]["guest_redirection"] = "/login/";
-$dist_config["frontend_config"]["upload_max_size"] = 1024 * 1024 * 1024;
-
-$dist_config["services"]["Filegator\Services\Storage\Filesystem"]["config"][
-	"adapter"
-] = function () {
-	if (!empty($_SESSION["INACTIVE_SESSION_TIMEOUT"])) {
-		if ($_SESSION["INACTIVE_SESSION_TIMEOUT"] * 60 + $_SESSION["LAST_ACTIVITY"] < time()) {
-			$v_user = quoteshellarg($_SESSION["user"]);
-			$v_session_id = quoteshellarg($_SESSION["token"]);
-			exec(
-				"/usr/local/hestia/bin/v-log-user-logout " . $v_user . " " . $v_session_id,
-				$output,
-				$return_var,
-			);
-			unset($_SESSION);
-			session_unset();
-			session_destroy();
-			session_start();
-			echo '<meta http-equiv="refresh" content="0; url=/">';
-			exit();
-		} else {
-			$_SESSION["LAST_ACTIVITY"] = time();
-		}
-	} else {
-		echo '<meta http-equiv="refresh" content="0; url=/">';
-	}
-	if (isset($_SESSION["user"])) {
-		$v_user = $_SESSION["user"];
-	}
-	if (!empty($_SESSION["look"])) {
-		if (isset($_SESSION["look"]) && $_SESSION["userContext"] === "admin") {
-			$v_user = $_SESSION["look"];
-		}
-		if (
-			isset($_SESSION["look"]) &&
-			$_SESSION["look"] == "admin" &&
-			$_SESSION["POLICY_SYSTEM_PROTECTED_ADMIN"] == "yes"
-		) {
-			header("Location: /");
-		}
-	}
-	# Create filemanager sftp key if missing and trash it after 30 min
-	if (!file_exists("/home/" . basename($v_user) . "/.ssh/hst-filemanager-key")) {
-		exec(
-			"sudo /usr/local/hestia/bin/v-add-user-sftp-key " .
-				quoteshellarg(basename($v_user)) .
-				" 30",
-			$output,
-			$return_var,
-		);
-		// filemanager also requires .ssh chmod o+x ... hopefully we can improve it to g+x or u+x someday
-		// current minimum for filemanager: chmod 0701 .ssh
-		shell_exec("sudo chmod o+x " . quoteshellarg("/home/" . basename($v_user) . "/.ssh"));
-	}
-
-	if (!isset($_SESSION["SFTP_PORT"])) {
-		exec("sudo /usr/local/hestia/bin/v-list-sys-sshd-port json", $output, $result);
-		$port = json_decode(implode("", $output));
-		if (is_numeric($port[0]) && $port[0] > 0) {
-			$_SESSION["SFTP_PORT"] = $port[0];
-		} elseif (
-			preg_match('/^\s*Port\s+(\d+)$/im', file_get_contents("/etc/ssh/sshd_config"), $matches)
-		) {
-			$_SESSION["SFTP_PORT"] = $matches[1] ?? 22;
-		} else {
-			$_SESSION["SFTP_PORT"] = 22;
-		}
-	}
-
-	preg_match(
-		'/(Hestia SFTP Chroot\nMatch User)(.*)/i',
-		file_get_contents("/etc/ssh/sshd_config"),
-		$matches,
-	);
-	$user_list = explode(",", $matches[2]);
-	if (in_array($v_user, $user_list)) {
-		$root = "/";
-	} else {
-		$root = "/home/" . $v_user;
-	}
-
-	return new \League\Flysystem\Sftp\SftpAdapter([
-		"host" => "127.0.0.1",
-		"port" => intval($_SESSION["SFTP_PORT"]),
-		"username" => basename($v_user),
-		"privateKey" => "/home/" . basename($v_user) . "/.ssh/hst-filemanager-key",
-		"root" => $root,
-		"timeout" => 10,
-		"directoryPerm" => 0755,
-	]);
-};
-
-$dist_config["services"]["Filegator\Services\Archiver\ArchiverInterface"] = [
-	"handler" => "\Filegator\Services\Archiver\Adapters\HestiaZipArchiver",
-	"config" => [],
-];
-
-$dist_config["services"]["Filegator\Services\Auth\AuthInterface"] = [
-	"handler" => "\Filegator\Services\Auth\Adapters\HestiaAuth",
-	"config" => [
-		"permissions" => ["read", "write", "upload", "download", "batchdownload", "zip"],
-		"private_repos" => false,
-	],
-];
-
-$dist_config["services"]["Filegator\Services\View\ViewInterface"]["config"] = [
-	"add_to_head" => '
-    <style>
-        .logo {
-            width: 46px;
-        }
-    </style>
-    ',
-	"add_to_body" => '
-<script>
-    var checkVueLoaded = setInterval(function() {
-        if (document.getElementsByClassName("container").length) {
-            clearInterval(checkVueLoaded);
-            var navProfile = document.getElementsByClassName("navbar-item profile")[0]; navProfile.replaceWith(navProfile.cloneNode(true))
-            document.getElementsByClassName("navbar-item logout")[0].text="Exit to Control Panel \u00BB";
-            div = document.getElementsByClassName("container")[0];
-            callback = function(){
-                if (document.getElementsByClassName("navbar-item logout")[0]){
-                    if ( document.getElementsByClassName("navbar-item logout")[0].text != "Exit to Control Panel \u00BB" ){
-                        var navProfile = document.getElementsByClassName("navbar-item profile")[0]; navProfile.replaceWith(navProfile.cloneNode(true))
-                        document.getElementsByClassName("navbar-item logout")[0].text="Exit to Control Panel \u00BB";
-                    }
-                }
-            }
-            config = {
-                childList:true,
-                subtree:true
-            }
-            observer = new MutationObserver(callback);
-            observer.observe(div,config);
-        }
-    }, 200);
-</script>',
-];
-
-return $dist_config;

install/deb/filemanager/install-fm.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# Checking root permissions
-if [ "x$(id -u)" != 'x0' ]; then
-	echo "Error: Script can be run executed only by root"
-	exit 10
-fi
-
-if [ -z "$HESTIA" ]; then
-	HESTIA="/usr/local/hestia"
-fi
-
-user='admin'
-fm_error='no'
-source $HESTIA/func/main.sh
-source $HESTIA/install/upgrade/upgrade.conf
-
-if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_INSTALL_DIR" ]; then
-	echo "Error: Hestia environment vars not present"
-	exit 2
-fi
-
-FM_INSTALL_DIR="$HESTIA/web/fm"
-
-FM_FILE="filegator_latest"
-FM_URL="https://github.com/filegator/static/raw/master/builds/filegator_latest.zip"
-
-COMPOSER_BIN="$HOMEDIR/$user/.composer/composer"
-if [ ! -f "$COMPOSER_BIN" ]; then
-	$BIN/v-add-user-composer "$user"
-	if [ $? -ne 0 ]; then
-		$BIN/v-add-user-notification admin 'Composer installation failed!' '<p class="u-text-bold">The File Manager will not work without Composer.</p><p>Please try running the installer from a shell session:<br><code>bash $HESTIA/install/deb/filemanager/install-fm.sh</code></p><p>If this issue continues, please <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">open an issue on GitHub</a>.</p>'
-		fm_error='yes'
-	fi
-fi
-
-if [ "$fm_error" != "yes" ]; then
-	rm --recursive --force "$FM_INSTALL_DIR"
-	mkdir -p "$FM_INSTALL_DIR"
-	cd "$FM_INSTALL_DIR"
-
-	[ ! -f "${FM_INSTALL_DIR}/${FM_FILE}" ] && wget "$FM_URL" --quiet -O "${FM_INSTALL_DIR}/${FM_FILE}.zip"
-
-	unzip -qq "${FM_INSTALL_DIR}/${FM_FILE}.zip"
-	mv --force ${FM_INSTALL_DIR}/filegator/* "${FM_INSTALL_DIR}"
-	rm --recursive --force ${FM_INSTALL_DIR}/${FM_FILE}
-	[[ -f "${FM_INSTALL_DIR}/${FM_FILE}" ]] && rm "${FM_INSTALL_DIR}/${FM_FILE}"
-
-	cp --recursive --force ${HESTIA_INSTALL_DIR}/filemanager/filegator/* "${FM_INSTALL_DIR}"
-
-	chown $user: -R "${FM_INSTALL_DIR}"
-
-	# Check if php7.3 is available and run the installer
-	if [ -f "/usr/bin/php7.3" ]; then
-		COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php7.3 $COMPOSER_BIN --quiet --no-dev install
-		if [ $? -ne 0 ]; then
-			$BIN/v-add-user-notification admin 'File Manager installation failed!' '<p>Please try running the installer from a shell session:<br><code>bash $HESTIA/install/deb/filemanager/install-fm.sh</code></p><p>If this issue continues, please <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">open an issue on GitHub</a>.</p>'
-			fm_error="yes"
-		fi
-	else
-		$BIN/v-add-user-notification admin 'File Manager installation failed!' '<p class="u-text-bold">Unable to proceed with installation of File Manager.</p><p>Package <span class="u-text-bold">php7.3-cli</span> is missing from your system. Please check your PHP installation and environment settings.</p>'
-		fm_error="yes"
-	fi
-
-	if [ "$fm_error" != "yes" ]; then
-		chown root: -R "${FM_INSTALL_DIR}"
-		chown $user: "${FM_INSTALL_DIR}/private"
-		chown $user: "${FM_INSTALL_DIR}/private/logs"
-		chown $user: "${FM_INSTALL_DIR}/repository"
-	fi
-fi

install/deb/logrotate/apache2

@@ -1,19 +0,0 @@
-/var/log/apache2/*.log /var/log/apache2/domains/*log {
-    rotate 4
-    weekly
-    missingok
-    notifempty
-    compress
-    delaycompress
-    create 640
-    sharedscripts
-    postrotate
-        /etc/init.d/apache2 reload > /dev/null || true
-        [ ! -f /run/nginx.pid ] || kill -USR1 `cat /run/nginx.pid`
-        endscript
-    prerotate
-        if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
-        run-parts /etc/logrotate.d/httpd-prerotate; \
-        fi; \
-        endscript
-}

install/deb/logrotate/dovecot

@@ -1,12 +0,0 @@
-/var/log/dovecot*.log {
-    rotate 4
-    weekly
-    missingok
-    notifempty
-    compress
-    delaycompress
-    sharedscripts
-    postrotate
-    doveadm log reopen
-    endscript
-}

install/deb/logrotate/hestia

@@ -1,7 +0,0 @@
-/var/log/hestia/*.log {
-    rotate 12
-    monthly
-    missingok
-    notifempty
-    create 0600 root root
-}

install/deb/logrotate/httpd-prerotate/awstats

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Changes made by HestiaCP due to https://github.com/hestiacp/hestiacp/issues/3289
-/usr/local/hestia/bin/v-update-sys-queue webstats

install/deb/logrotate/nginx

@@ -1,13 +0,0 @@
-/var/log/nginx/*log /var/log/nginx/domains/*log {
-    rotate 4
-    weekly
-    missingok
-    notifempty
-    compress
-    delaycompress
-    create 640
-    sharedscripts
-    postrotate
-        [ -f /run/nginx.pid ] && kill -USR1 `cat /run/nginx.pid`
-        endscript
-}

install/deb/logrotate/roundcube

@@ -1,7 +0,0 @@
-/var/log/roundcube/*.log {
-    rotate 12
-    monthly
-    missingok
-    notifempty
-    create 644 www-data www-data
-}

install/deb/mysql/my-large.cnf

@@ -1,50 +0,0 @@
-[client]
-port=3306
-socket=/run/mysqld/mysqld.sock
-default-character-set=utf8mb4
-
-[mysql]
-default-character-set=utf8mb4
-
-[mysqld_safe]
-socket=/run/mysqld/mysqld.sock
-
-[mysqld]
-user=mysql
-pid-file=/run/mysqld/mysqld.pid
-socket=/run/mysqld/mysqld.sock
-port=3306
-basedir=/usr
-datadir=/var/lib/mysql
-tmpdir=/tmp
-lc-messages-dir=/usr/share/mysql
-log_error=/var/log/mysql/error.log
-collation-server = utf8mb4_unicode_520_ci
-init-connect='SET NAMES utf8mb4'
-character-set-server = utf8mb4
-
-symbolic-links=0
-local-infile=0
-
-skip-external-locking
-key_buffer_size = 256M
-max_allowed_packet = 32M
-table_open_cache = 256
-sort_buffer_size = 1M
-read_buffer_size = 1M
-read_rnd_buffer_size = 4M
-myisam_sort_buffer_size = 64M
-thread_cache_size = 8
-query_cache_size= 16M
-
-#innodb_use_native_aio = 0
-innodb_file_per_table
-
-max_connections=200
-max_user_connections=50
-wait_timeout=10
-interactive_timeout=50
-long_query_time=5
-
-!includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mariadb.conf.d/

install/deb/mysql/my-medium.cnf

@@ -1,49 +0,0 @@
-[client]
-port=3306
-socket=/run/mysqld/mysqld.sock
-default-character-set=utf8mb4
-
-[mysql]
-default-character-set=utf8mb4
-
-[mysqld_safe]
-socket=/run/mysqld/mysqld.sock
-
-[mysqld]
-user=mysql
-pid-file=/run/mysqld/mysqld.pid
-socket=/run/mysqld/mysqld.sock
-port=3306
-basedir=/usr
-datadir=/var/lib/mysql
-tmpdir=/tmp
-lc-messages-dir=/usr/share/mysql
-log_error=/var/log/mysql/error.log
-collation-server = utf8mb4_unicode_520_ci
-init-connect='SET NAMES utf8mb4'
-character-set-server = utf8mb4
-
-symbolic-links=0
-local-infile=0
-
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 16M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-#innodb_use_native_aio = 0
-innodb_file_per_table
-
-max_connections=70
-max_user_connections=30
-wait_timeout=10
-interactive_timeout=50
-long_query_time=5
-
-!includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mariadb.conf.d/

install/deb/mysql/my-small.cnf

@@ -1,49 +0,0 @@
-[client]
-port=3306
-socket=/run/mysqld/mysqld.sock
-default-character-set=utf8mb4
-
-[mysql]
-default-character-set=utf8mb4
-
-[mysqld_safe]
-socket=/run/mysqld/mysqld.sock
-
-[mysqld]
-user=mysql
-pid-file=/run/mysqld/mysqld.pid
-socket=/run/mysqld/mysqld.sock
-port=3306
-basedir=/usr
-datadir=/var/lib/mysql
-tmpdir=/tmp
-lc-messages-dir=/usr/share/mysql
-log_error=/var/log/mysql/error.log
-collation-server = utf8mb4_unicode_520_ci
-init-connect='SET NAMES utf8mb4'
-character-set-server = utf8mb4
-
-symbolic-links=0
-local-infile=0
-
-skip-external-locking
-key_buffer_size = 16K
-max_allowed_packet = 1M
-table_open_cache = 10
-sort_buffer_size = 64K
-read_buffer_size = 256K
-read_rnd_buffer_size = 256K
-net_buffer_length = 2K
-thread_stack = 240K
-
-#innodb_use_native_aio = 0
-innodb_file_per_table
-
-max_connections=30
-max_user_connections=20
-wait_timeout=10
-interactive_timeout=50
-long_query_time=5
-
-!includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mariadb.conf.d/

install/deb/nginx/0rtt-anti-replay.conf

@@ -1,39 +0,0 @@
-# Implement TLS 1.3 0-RTT anti-replay for NGINX
-
-# Requires: NGINX directive "ssl_early_data" on
-
-# Usage:
-
-# Make sure these "map" blocks are included in "http" block
-# Put the following two lines in SSL "server" block, before any "location" blocks
-
-# if ($anti_replay = 307) { return 307 https://$host$request_uri; }
-# if ($anti_replay = 425) { return 425; }
-
-# Pass "Early-Data" header to backend/upstream
-# Only for 0-RTT requests from clients that understand 425 status code (RFC 8470)
-
-# fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
-# proxy_set_header Early-Data $rfc_early_data;
-
-# Copyright © myrevery
-# Copyright © 7677333 (An anagram of a Anonymous Cybersecurity Research Team)
-
-map "$request_method:$is_args" $ar_idempotent {
-	default 0;
-	"~^GET:$|^(HEAD|OPTIONS|TRACE):\?*$" 1;
-}
-
-map $http_user_agent $ar_support_425 {
-	default 0;
-	"~Firefox/((58|59)|([6-9]\d)|([1-9]\d{2,}))\.\d+" 1;
-}
-
-map "$ssl_early_data:$ar_idempotent:$ar_support_425" $anti_replay {
-	1:0:0 307;
-	1:0:1 425;
-}
-
-map "$ssl_early_data:$ar_support_425" $rfc_early_data {
-	1:1 1;
-}

install/deb/nginx/agents.conf

@@ -1,16 +0,0 @@
-map $http_user_agent $mobile_request {
-	default                      desktopversion;
-	"~*ipad"                     mobileversion;
-	"~*android.*mobile"          mobileversion;
-	"~*iphone"                   mobileversion;
-	"~*ipod.*mobile"             mobileversion;
-	"~*BlackBerry*Mobile Safari" mobileversion;
-	"~*BB*Mobile Safari"         mobileversion;
-	"~*Opera.*Mini/7"            mobileversion;
-	"~*IEMobile/10.*Touch"       mobileversion;
-	"~*IEMobile/11.*Touch"       mobileversion;
-	"~*IEMobile/7.0"             mobileversion;
-	"~*IEMobile/9.0"             mobileversion;
-	"~*Firefox.*Mobile"          mobileversion;
-	"~*webOS"                    mobileversion;
-}

install/deb/nginx/nginx.conf

@@ -1,130 +0,0 @@
-# Server globals
-user                 www-data;
-worker_processes     auto;
-worker_rlimit_nofile 65535;
-error_log            /var/log/nginx/error.log;
-pid                  /run/nginx.pid;
-include              /etc/nginx/conf.d/main/*.conf;
-include              /etc/nginx/modules-enabled/*.conf;
-
-# Worker config
-events {
-	worker_connections 1024;
-	use                epoll;
-	multi_accept       on;
-}
-
-http {
-	# Main settings
-	sendfile                        on;
-	tcp_nopush                      on;
-	tcp_nodelay                     on;
-	client_header_timeout           180s;
-	client_body_timeout             180s;
-	client_header_buffer_size       2k;
-	client_body_buffer_size         256k;
-	client_max_body_size            1024m;
-	large_client_header_buffers     4 8k;
-	send_timeout                    60s;
-	keepalive_timeout               30s;
-	keepalive_requests              10000;
-	reset_timedout_connection       on;
-	server_tokens                   off;
-	server_name_in_redirect         off;
-	server_names_hash_max_size      512;
-	server_names_hash_bucket_size   512;
-	charset                         utf-8;
-	# FastCGI settings
-	fastcgi_buffers                 512 4k;
-	fastcgi_buffer_size             256k;
-	fastcgi_busy_buffers_size       256k;
-	fastcgi_temp_file_write_size    256k;
-	fastcgi_connect_timeout         30s;
-	fastcgi_read_timeout            300s;
-	fastcgi_send_timeout            180s;
-	fastcgi_cache_lock              on;
-	fastcgi_cache_lock_timeout      5s;
-	fastcgi_cache_background_update on;
-	fastcgi_cache_revalidate        on;
-	# Proxy settings
-	proxy_redirect                  off;
-	proxy_set_header                Host $host;
-	proxy_set_header                Early-Data $rfc_early_data;
-	proxy_set_header                X-Real-IP $remote_addr;
-	proxy_set_header                X-Forwarded-For $proxy_add_x_forwarded_for;
-	proxy_pass_header               Set-Cookie;
-	proxy_buffers                   256 4k;
-	proxy_buffer_size               32k;
-	proxy_busy_buffers_size         32k;
-	proxy_temp_file_write_size      256k;
-	proxy_connect_timeout           30s;
-	proxy_read_timeout              300s;
-	proxy_send_timeout              180s;
-	# Log format
-	log_format                      main '$remote_addr - $remote_user [$time_local] $request "$status" $body_bytes_sent "$http_referer" "$http_user_agent" "$http_x_forwarded_for"';
-	log_format                      bytes '$body_bytes_sent';
-	log_not_found                   off;
-	access_log                      off;
-	# Mime settings
-	include                         /etc/nginx/mime.types;
-	default_type                    application/octet-stream;
-	# Compression
-	gzip                            on;
-	gzip_vary                       on;
-	gzip_static                     on;
-	gzip_comp_level                 6;
-	gzip_min_length                 1024;
-	gzip_buffers                    128 4k;
-	gzip_http_version               1.1;
-	gzip_types                      text/css text/javascript text/js text/plain text/richtext text/shtml text/x-component text/x-java-source text/x-markdown text/x-script text/xml image/bmp image/svg+xml image/vnd.microsoft.icon image/x-icon font/otf font/ttf font/x-woff multipart/bag multipart/mixed application/eot application/font application/font-sfnt application/font-woff application/javascript application/javascript-binast application/json application/ld+json application/manifest+json application/opentype application/otf application/rss+xml application/ttf application/truetype application/vnd.api+json application/vnd.ms-fontobject application/wasm application/xhtml+xml application/xml application/xml+rss application/x-httpd-cgi application/x-javascript application/x-opentype application/x-otf application/x-perl application/x-protobuf application/x-ttf;
-	gzip_proxied                    any;
-	# Cloudflare IPs
-	include                         /etc/nginx/conf.d/cloudflare.inc;
-	# SSL PCI compliance
-	ssl_buffer_size                 1369;
-	ssl_ciphers                     "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA256";
-	ssl_dhparam                     /etc/ssl/dhparam.pem;
-	ssl_early_data                  on;
-	ssl_ecdh_curve                  auto;
-	ssl_prefer_server_ciphers       on;
-	ssl_protocols                   TLSv1.2 TLSv1.3;
-	ssl_session_cache               shared:SSL:20m;
-	ssl_session_tickets             on;
-	ssl_session_timeout             7d;
-	resolver                        1.0.0.1 8.8.4.4 1.1.1.1 8.8.8.8 valid=300s ipv6=off;
-	resolver_timeout                5s;
-	# Error pages
-	error_page                      403 /error/404.html;
-	error_page                      404 /error/404.html;
-	error_page                      410 /error/410.html;
-	error_page                      500 501 502 503 504 505 /error/50x.html;
-	# Proxy cache
-	proxy_cache_path                /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m;
-	proxy_cache_key                 "$scheme$request_method$host$request_uri";
-	proxy_temp_path                 /var/cache/nginx/temp;
-	proxy_ignore_headers            Cache-Control Expires;
-	proxy_cache_use_stale           error timeout invalid_header updating http_502;
-	proxy_cache_valid               any 1d;
-	# FastCGI cache
-	fastcgi_cache_path              /var/cache/nginx/micro levels=1:2 keys_zone=microcache:10m inactive=30m max_size=1024m;
-	fastcgi_cache_key               "$scheme$request_method$host$request_uri";
-	fastcgi_ignore_headers          Cache-Control Expires Set-Cookie;
-	fastcgi_cache_use_stale         error timeout invalid_header updating http_500 http_503;
-	add_header                      X-FastCGI-Cache $upstream_cache_status;
-
-	# Cache bypass
-	map $http_cookie $no_cache {
-		default              0;
-		~SESS                1;
-		~wordpress_logged_in 1;
-	}
-
-	# File cache (static assets)
-	open_file_cache                 max=10000 inactive=30s;
-	open_file_cache_valid           60s;
-	open_file_cache_min_uses        2;
-	open_file_cache_errors          off;
-	# Wildcard include
-	include                         /etc/nginx/conf.d/*.conf;
-	include                         /etc/nginx/conf.d/domains/*.conf;
-}

install/deb/nginx/phpmyadmin.inc

@@ -1,26 +0,0 @@
-location /%pma_alias% {
-	alias /usr/share/phpmyadmin/;
-
-	location ~ /(libraries|setup|templates|locale) {
-		deny   all;
-		return 404;
-	}
-
-	location ~ /(.+\.(json|lock|md)) {
-		deny   all;
-		return 404;
-	}
-
-	location ~ ^/%pma_alias%/(.*\.php)$ {
-		alias         /usr/share/phpmyadmin/$1;
-		include       /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
-		fastcgi_index index.php;
-		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
-		fastcgi_param SCRIPT_FILENAME $request_filename;
-		fastcgi_pass  127.0.0.1:9000;
-	}
-
-	location /%pma_alias%/(.+\.(jpg|jpeg|gif|css|png|webp|js|ico|html|xml|txt))$ {
-		root /usr/share/phpmyadmin/;
-	}
-}

install/deb/nginx/phppgadmin.inc

@@ -1,12 +0,0 @@
-location /%pga_alias% {
-	alias /usr/share/phppgadmin/;
-
-	location ~ ^/%pga_alias%/(.*\.php)$ {
-		alias         /usr/share/phppgadmin/$1;
-		include       /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
-		fastcgi_index index.php;
-		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
-		fastcgi_param SCRIPT_FILENAME $request_filename;
-		fastcgi_pass  127.0.0.1:9000;
-	}
-}

install/deb/nginx/status.conf

@@ -1,11 +0,0 @@
-server {
-	listen                  127.0.0.1:8084 default_server;
-	server_name             _;
-	server_name_in_redirect off;
-
-	location / {
-		stub_status on;
-		access_log  off;
-		error_log   /dev/null;
-	}
-}

install/deb/nginx/unassigned.inc

@@ -1,52 +0,0 @@
-server {
-	listen      directIP:80 default_server;
-	server_name _;
-	access_log  off;
-	error_log   /dev/null;
-
-	location / {
-		root /var/www/html;
-
-		location /phpmyadmin/ {
-			alias  /var/www/document_errors/;
-			return 404;
-		}
-
-		location /phppgadmin/ {
-			alias  /var/www/document_errors/;
-			return 404;
-		}
-
-		location /webmail {
-			alias  /var/www/document_errors/;
-			return 404;
-		}
-
-		location /webmail/ {
-			alias  /var/www/document_errors/;
-			return 404;
-		}
-
-		location /error/ {
-			alias /var/www/document_errors/;
-		}
-	}
-}
-
-server {
-	listen              directIP:443 default_server ssl;
-	server_name         _;
-	access_log          off;
-	error_log           /dev/null;
-	ssl_certificate     /usr/local/hestia/ssl/certificate.crt;
-	ssl_certificate_key /usr/local/hestia/ssl/certificate.key;
-	return              301 http://$host$request_uri;
-
-	location / {
-		root /var/www/document_errors/;
-	}
-
-	location /error/ {
-		alias /var/www/document_errors/;
-	}
-}

install/deb/pga/config.inc.php

@@ -1,166 +0,0 @@
-<?php
-
-/**
- * Central phpPgAdmin configuration.  As a user you may modify the
- * settings here for your particular configuration.
- *
- * $Id: config.inc.php-dist,v 1.55 2008/02/18 21:10:31 xzilla Exp $
- */
-
-// An example server.  Create as many of these as you wish,
-// indexed from zero upwards.
-
-// Display name for the server on the login screen
-$conf["servers"][0]["desc"] = "PostgreSQL";
-
-// Hostname or IP address for server.  Use '' for UNIX domain socket.
-// use 'localhost' for TCP/IP connection on this computer
-$conf["servers"][0]["host"] = "localhost";
-
-// Database port on server (5432 is the PostgreSQL default)
-$conf["servers"][0]["port"] = 5432;
-
-// Database SSL mode
-// Possible options: disable, allow, prefer, require
-// To require SSL on older servers use option: legacy
-// To ignore the SSL mode, use option: unspecified
-$conf["servers"][0]["sslmode"] = "allow";
-
-// Change the default database only if you cannot connect to template1.
-// For a PostgreSQL 8.1+ server, you can set this to 'postgres'.
-$conf["servers"][0]["defaultdb"] = "template1";
-
-// Specify the path to the database dump utilities for this server.
-// You can set these to '' if no dumper is available.
-$conf["servers"][0]["pg_dump_path"] = "/usr/bin/pg_dump";
-$conf["servers"][0]["pg_dumpall_path"] = "/usr/bin/pg_dumpall";
-
-// Slony (www.slony.info) support?
-$conf["servers"][0]["slony_support"] = false;
-// Specify the path to the Slony SQL scripts (where slony1_base.sql is located, etc.)
-// No trailing slash.
-$conf["servers"][0]["slony_sql"] = "/usr/share/pgsql";
-
-// Example for a second server (PostgreSQL for Windows)
-//$conf['servers'][1]['desc'] = 'Test Server';
-//$conf['servers'][1]['host'] = '127.0.0.1';
-//$conf['servers'][1]['port'] = 5432;
-//$conf['servers'][1]['sslmode'] = 'allow';
-//$conf['servers'][1]['defaultdb'] = 'template1';
-//$conf['servers'][1]['pg_dump_path'] = 'C:\\Program Files\\PostgreSQL\\8.0\\bin\\pg_dump.exe';
-//$conf['servers'][1]['pg_dumpall_path'] = 'C:\\Program Files\\PostgreSQL\\8.0\\bin\\pg_dumpall.exe';
-//$conf['servers'][1]['slony_support'] = false;
-//$conf['servers'][1]['slony_sql'] = 'C:\\Program Files\\PostgreSQL\\8.0\\share';
-
-// Example of groups definition.
-// Groups allow administrators to logically group servers together under group nodes in the left browser tree
-//
-// The group '0' description
-//$conf['srv_groups'][0]['desc'] = 'group one';
-//
-// Add here server indexes belonging to the group '0' separated by comma
-//$conf['srv_groups'][0]['servers'] = '0,1,2';
-//
-// A server can belong to multi groups
-//$conf['srv_groups'][1]['desc'] = 'group two';
-//$conf['srv_groups'][1]['servers'] = '3,1';
-
-// Default language. E.g.: 'english', 'polish', etc.  See lang/ directory
-// for all possibilities. If you specify 'auto' (the default) it will use
-// your browser preference.
-$conf["default_lang"] = "auto";
-
-// AutoComplete uses AJAX interaction to list foreign key values
-// on insert fields. It currently only works on single column
-// foreign keys. You can choose one of the following values:
-// 'default on' enables AutoComplete and turns it on by default.
-// 'default off' enables AutoComplete but turns it off by default.
-// 'disable' disables AutoComplete.
-$conf["autocomplete"] = "default on";
-
-// If extra session security is true, then PHP's session cookies will have
-// SameSite cookie flags set to prevent CSRF attacks.  If you're using
-// auto-start sessions, autostarted sessions will be destroyed and
-// restarted with SameSite on.  If this this solution is not acceptable for
-// your situation, you will need to either turn off auot-start sessions, or
-// turn off secure sessions.  Versions of PHP below 7.3 do not have access
-// to this feature and will be vulnerable to CSRF attacks.
-$conf["extra_session_security"] = true;
-
-// If extra login security is true, then logins via phpPgAdmin with no
-// password or certain usernames (pgsql, postgres, root, administrator)
-// will be denied. Only set this false once you have read the FAQ and
-// understand how to change PostgreSQL's pg_hba.conf to enable
-// passworded local connections.
-$conf["extra_login_security"] = true;
-
-// Only show owned databases?
-// Note: This will simply hide other databases in the list - this does
-// not in any way prevent your users from seeing other database by
-// other means. (e.g. Run 'SELECT * FROM pg_database' in the SQL area.)
-$conf["owned_only"] = false;
-
-// Display comments on objects?  Comments are a good way of documenting
-// a database, but they do take up space in the interface.
-$conf["show_comments"] = true;
-
-// Display "advanced" objects? Setting this to true will show
-// aggregates, types, operators, operator classes, conversions,
-// languages and casts in phpPgAdmin. These objects are rarely
-// administered and can clutter the interface.
-$conf["show_advanced"] = false;
-
-// Display "system" objects?
-$conf["show_system"] = false;
-
-// Display reports feature?  For this feature to work, you must
-// install the reports database as explained in the INSTALL file.
-$conf["show_reports"] = true;
-
-// Database and table for reports
-$conf["reports_db"] = "phppgadmin";
-$conf["reports_schema"] = "public";
-$conf["reports_table"] = "ppa_reports";
-
-// Only show owned reports?
-// Note: This does not prevent people from accessing other reports by
-// other means.
-$conf["owned_reports_only"] = false;
-
-// Minimum length users can set their password to.
-$conf["min_password_length"] = 1;
-
-// Width of the left frame in pixels (object browser)
-$conf["left_width"] = 200;
-
-// Which look & feel theme to use
-$conf["theme"] = "default";
-
-// Show OIDs when browsing tables?
-$conf["show_oids"] = false;
-
-// Max rows to show on a page when browsing record sets
-$conf["max_rows"] = 30;
-
-// Max chars of each field to display by default in browse mode
-$conf["max_chars"] = 50;
-
-// Send XHTML strict headers?
-$conf["use_xhtml_strict"] = false;
-
-// Base URL for PostgreSQL documentation.
-// '%s', if present, will be replaced with the PostgreSQL version
-// (e.g. 8.4 )
-$conf["help_base"] = "http://www.postgresql.org/docs/%s/interactive/";
-
-// Configuration for ajax scripts
-// Time in seconds. If set to 0, refreshing data using ajax will be disabled (locks and activity pages)
-$conf["ajax_refresh"] = 3;
-
-/*****************************************
- * Don't modify anything below this line *
- *****************************************/
-
-$conf["version"] = 19;
-
-?>

install/deb/pga/phppgadmin.conf

@@ -1,37 +0,0 @@
-Alias /%pga_alias% /usr/share/phppgadmin
-
-<Directory /usr/share/phppgadmin>
-
-DirectoryIndex index.php
-AllowOverride None
-
-order deny,allow
-deny from all
-allow from 127.0.0.0/255.0.0.0 ::1/128
-allow from all
-
-<IfModule mod_php5.c>
-  php_flag magic_quotes_gpc Off
-  php_flag track_vars On
-  php_value include_path .
-</IfModule>
-<IfModule mpm_event_module>
- # Use www.conf instead
- <FilesMatch \.php$>
-     SetHandler "proxy:fcgi://127.0.0.1:9000"
- </FilesMatch>
-</IfModule>
-<IfModule !mod_php5.c>
-  <IfModule mod_actions.c>
-    <IfModule mod_cgi.c>
-      AddType application/x-httpd-php .php
-      Action application/x-httpd-php /cgi-bin/php
-    </IfModule>
-    <IfModule mod_cgid.c>
-      AddType application/x-httpd-php .php
-      Action application/x-httpd-php /cgi-bin/php
-    </IfModule>
-  </IfModule>
-</IfModule>
-
-</Directory>

install/deb/php-fpm/dummy.conf

@@ -1,13 +0,0 @@
-; origin-src: deb/php-fpm/dummy.conf
-
-[www]
-listen = 127.0.0.1:9999
-listen.allowed_clients = 127.0.0.1
-
-user = www-data
-group = www-data
-
-pm = ondemand
-pm.max_children = 4
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s

install/deb/php-fpm/multiphp.tpl

@@ -1,31 +0,0 @@
-; origin-src: deb/php-fpm/multiphp.tpl
-;#=========================================================================#
-;# Default Web Domain Template                                             #
-;# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
-;# https://hestiacp.com/docs/server-administration/web-templates.html      #
-;#=========================================================================#
-
-[%domain%]
-listen = /run/php/php%backend_version%-fpm-%domain%.sock
-listen.owner = %user%
-listen.group = www-data
-listen.mode = 0660
-
-user = %user%
-group = %user%
-
-pm = ondemand
-pm.max_children = 8
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/%user%/tmp
-php_admin_value[session.save_path] = /home/%user%/tmp
-php_admin_value[open_basedir] = /home/%user%/.composer:/home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/private:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/tmp:/var/www/html:/bin:/usr/bin:/usr/local/bin:/usr/share:/opt
-php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f admin@%domain%
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/%user%/tmp
-env[TMPDIR] = /home/%user%/tmp
-env[TEMP] = /home/%user%/tmp

install/deb/php-fpm/php-fpm.conf

@@ -1,145 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;
-; FPM Configuration ;
-;;;;;;;;;;;;;;;;;;;;;
-
-; All relative paths in this configuration file are relative to PHP's install
-; prefix (/usr). This prefix can be dynamically changed by using the
-; '-p' argument from the command line.
-
-;;;;;;;;;;;;;;;;;;
-; Global Options ;
-;;;;;;;;;;;;;;;;;;
-
-[global]
-; Pid file
-; Note: the default prefix is /var
-; Default Value: none
-; Warning: if you change the value here, you need to modify systemd
-; service PIDFile= setting to match the value here.
-pid = /run/php/phpfpm_v-fpm.pid
-
-; Error log file
-; If it's set to "syslog", log is sent to syslogd instead of being written
-; into a local file.
-; Note: the default prefix is /var
-; Default Value: log/php-fpm.log
-error_log = /var/log/phpfpm_v-fpm.log
-
-; syslog_facility is used to specify what type of program is logging the
-; message. This lets syslogd specify that messages from different facilities
-; will be handled differently.
-; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
-; Default Value: daemon
-;syslog.facility = daemon
-
-; syslog_ident is prepended to every message. If you have multiple FPM
-; instances running on the same server, you can change the default value
-; which must suit common needs.
-; Default Value: php-fpm
-;syslog.ident = php$fpm_v-fpm
-
-; Log level
-; Possible Values: alert, error, warning, notice, debug
-; Default Value: notice
-log_level = error
-
-; Log limit on number of characters in the single line (log entry). If the
-; line is over the limit, it is wrapped on multiple lines. The limit is for
-; all logged characters including message prefix and suffix if present. However
-; the new line character does not count into it as it is present only when
-; logging to a file descriptor. It means the new line character is not present
-; when logging to syslog.
-; Default Value: 1024
-;log_limit = 4096
-
-; Log buffering specifies if the log line is buffered which means that the
-; line is written in a single write operation. If the value is false, then the
-; data is written directly into the file descriptor. It is an experimental
-; option that can potentially improve logging performance and memory usage
-; for some heavy logging scenarios. This option is ignored if logging to syslog
-; as it has to be always buffered.
-; Default value: yes
-;log_buffering = no
-
-; If this number of child processes exit with SIGSEGV or SIGBUS within the time
-; interval set by emergency_restart_interval then FPM will restart. A value
-; of '0' means 'Off'.
-; Default Value: 0
-emergency_restart_threshold = 10
-
-; Interval of time used by emergency_restart_interval to determine when
-; a graceful restart will be initiated.  This can be useful to work around
-; accidental corruptions in an accelerator's shared memory.
-; Available Units: s(econds), m(inutes), h(ours), or d(ays)
-; Default Unit: seconds
-; Default Value: 0
-emergency_restart_interval = 60s
-
-; Time limit for child processes to wait for a reaction on signals from master.
-; Available units: s(econds), m(inutes), h(ours), or d(ays)
-; Default Unit: seconds
-; Default Value: 0
-process_control_timeout = 10s
-
-; The maximum number of processes FPM will fork. This has been designed to control
-; the global number of processes when using dynamic PM within a lot of pools.
-; Use it with caution.
-; Note: A value of 0 indicates no limit
-; Default Value: 0
-; process.max = 128
-
-; Specify the nice(2) priority to apply to the master process (only if set)
-; The value can vary from -19 (highest priority) to 20 (lowest priority)
-; Note: - It will only work if the FPM master process is launched as root
-;       - The pool process will inherit the master process priority
-;         unless specified otherwise
-; Default Value: no set
-; process.priority = -19
-
-; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
-; Default Value: yes
-;daemonize = yes
-
-; Set open file descriptor rlimit for the master process.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit for the master process.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Specify the event mechanism FPM will use. The following is available:
-; - select     (any POSIX os)
-; - poll       (any POSIX os)
-; - epoll      (linux >= 2.5.44)
-; - kqueue     (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
-; - /dev/poll  (Solaris >= 7)
-; - port       (Solaris >= 10)
-; Default Value: not set (auto detection)
-events.mechanism = epoll
-
-; When FPM is built with systemd integration, specify the interval,
-; in seconds, between health report notification to systemd.
-; Set to 0 to disable.
-; Available Units: s(econds), m(inutes), h(ours)
-; Default Unit: seconds
-; Default value: 10
-;systemd_interval = 10
-
-;;;;;;;;;;;;;;;;;;;;
-; Pool Definitions ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Multiple pools of child processes may be started with different listening
-; ports and different management options.  The name of the pool will be
-; used in logs and stats. There is no limitation on the number of pools which
-; FPM can handle. Your system will tell you anyway :)
-
-; Include one or more files. If glob(3) exists, it is used to include a bunch of
-; files from a glob(3) pattern. This directive can be used everywhere in the
-; file.
-; Relative path can also be used. They will be prefixed by:
-;  - the global prefix if it's been set (-p argument)
-;  - /usr otherwise
-include=/etc/php/fpm_v/fpm/pool.d/*.conf

install/deb/php-fpm/www.conf

@@ -1,13 +0,0 @@
-; origin-src: deb/php-fpm/www.conf
-
-[www]
-listen = 127.0.0.1:9000
-listen.allowed_clients = 127.0.0.1
-
-user = www-data
-group = www-data
-
-pm = ondemand
-pm.max_children = 4
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s

install/deb/phpmyadmin/config.inc.php

@@ -1,36 +0,0 @@
-<?php
-/* PHPmyadmin config for Hestia 1.3.3 > */
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * All directives are explained in documentation in the doc/ folder
- * or at <https://docs.phpmyadmin.net/>.
- *
- * @package PhpMyAdmin
- */
-declare(strict_types=1);
-
-/**
- * This is needed for cookie based authentication to encrypt password in
- * cookie. Needs to be 32 chars long.
- */
-$cfg["blowfish_secret"] = "%blowfish_secret%"; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-
-/**
- * Directories for saving/loading files from server
- */
-$cfg["UploadDir"] = "";
-$cfg["SaveDir"] = "";
-
-/**
- * You can find more configuration options in the documentation
- * in the doc/ folder or at <https://docs.phpmyadmin.net/>.
- */
-
-//start with 1 other wise it doesn't work
-$i = 1;
-foreach (glob("/etc/phpmyadmin/conf.d/*.php") as $filename) {
-	include $filename;
-	/*Don't remove / alter code here below this will add SSO support for all servers*/
-	//Add Hestia SSO code here
-	$i++;
-}

install/deb/phpmyadmin/create_tables.sql

@@ -1,389 +0,0 @@
--- --------------------------------------------------------
--- SQL Commands to set up the pmadb as described in the documentation.
---
--- This file is meant for use with MySQL 5 and above!
---
--- This script expects the user pma to already be existing. If we would put a
--- line here to create him too many users might just use this script and end
--- up with having the same password for the controluser.
---
--- This user "pma" must be defined in config.inc.php (controluser/controlpass)
---
--- Please don't forget to set up the tablenames in config.inc.php
---
--- --------------------------------------------------------
---
--- Database : `phpmyadmin`
---
-CREATE DATABASE IF NOT EXISTS `phpmyadmin` DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
-USE phpmyadmin;
-
--- --------------------------------------------------------
---
--- Privileges
---
--- (activate this statement if necessary)
--- GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO
---    'pma'@localhost;
--- --------------------------------------------------------
---
--- Table structure for table `pma__usergroups`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__usergroups` (
-		`usergroup` varchar(64) NOT NULL,
-		`tab` varchar(64) NOT NULL,
-		`allowed` enum ('Y', 'N') NOT NULL DEFAULT 'N',
-		PRIMARY KEY (`usergroup`, `tab`, `allowed`)
-	) COMMENT = 'User groups with configured menu items' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__designer_coords`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__designer_coords` (
-		`db_name` varchar(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-		`table_name` varchar(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-		`x` int (11) DEFAULT NULL,
-		`y` int (11) DEFAULT NULL,
-		`v` tinyint (4) DEFAULT NULL,
-		`h` tinyint (4) DEFAULT NULL,
-		PRIMARY KEY (`db_name`, `table_name`)
-	) ENGINE = MyISAM DEFAULT CHARSET = utf8 COLLATE = utf8_bin COMMENT = 'Table coordinates for Designer';
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__bookmark`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__bookmark` (
-		`id` int (11) NOT NULL auto_increment,
-		`dbase` varchar(255) NOT NULL default '',
-		`user` varchar(255) NOT NULL default '',
-		`label` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-		`query` text NOT NULL,
-		PRIMARY KEY (`id`)
-	) COMMENT = 'Bookmarks' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__column_info`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__column_info` (
-		`id` int (5) unsigned NOT NULL auto_increment,
-		`db_name` varchar(64) NOT NULL default '',
-		`table_name` varchar(64) NOT NULL default '',
-		`column_name` varchar(64) NOT NULL default '',
-		`comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-		`mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-		`transformation` varchar(255) NOT NULL default '',
-		`transformation_options` varchar(255) NOT NULL default '',
-		`input_transformation` varchar(255) NOT NULL default '',
-		`input_transformation_options` varchar(255) NOT NULL default '',
-		PRIMARY KEY (`id`),
-		UNIQUE KEY `db_name` (`db_name`, `table_name`, `column_name`)
-	) COMMENT = 'Column information for phpMyAdmin' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__history`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__history` (
-		`id` bigint (20) unsigned NOT NULL auto_increment,
-		`username` varchar(64) NOT NULL default '',
-		`db` varchar(64) NOT NULL default '',
-		`table` varchar(64) NOT NULL default '',
-		`timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP,
-		`sqlquery` text NOT NULL,
-		PRIMARY KEY (`id`),
-		KEY `username` (`username`, `db`, `table`, `timevalue`)
-	) COMMENT = 'SQL history for phpMyAdmin' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__pdf_pages`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__pdf_pages` (
-		`db_name` varchar(64) NOT NULL default '',
-		`page_nr` int (10) unsigned NOT NULL auto_increment,
-		`page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '',
-		PRIMARY KEY (`page_nr`),
-		KEY `db_name` (`db_name`)
-	) COMMENT = 'PDF relation pages for phpMyAdmin' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__recent`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__recent` (
-		`username` varchar(64) NOT NULL,
-		`tables` text NOT NULL,
-		PRIMARY KEY (`username`)
-	) COMMENT = 'Recently accessed tables' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__favorite`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__favorite` (
-		`username` varchar(64) NOT NULL,
-		`tables` text NOT NULL,
-		PRIMARY KEY (`username`)
-	) COMMENT = 'Favorite tables' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__table_uiprefs`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__table_uiprefs` (
-		`username` varchar(64) NOT NULL,
-		`db_name` varchar(64) NOT NULL,
-		`table_name` varchar(64) NOT NULL,
-		`prefs` text NOT NULL,
-		`last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-		PRIMARY KEY (`username`, `db_name`, `table_name`)
-	) COMMENT = 'Tables'' UI preferences' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__relation`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__relation` (
-		`master_db` varchar(64) NOT NULL default '',
-		`master_table` varchar(64) NOT NULL default '',
-		`master_field` varchar(64) NOT NULL default '',
-		`foreign_db` varchar(64) NOT NULL default '',
-		`foreign_table` varchar(64) NOT NULL default '',
-		`foreign_field` varchar(64) NOT NULL default '',
-		PRIMARY KEY (`master_db`, `master_table`, `master_field`),
-		KEY `foreign_field` (`foreign_db`, `foreign_table`)
-	) COMMENT = 'Relation table' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__table_coords`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__table_coords` (
-		`db_name` varchar(64) NOT NULL default '',
-		`table_name` varchar(64) NOT NULL default '',
-		`pdf_page_number` int (11) NOT NULL default '0',
-		`x` float unsigned NOT NULL default '0',
-		`y` float unsigned NOT NULL default '0',
-		PRIMARY KEY (`db_name`, `table_name`, `pdf_page_number`)
-	) COMMENT = 'Table coordinates for phpMyAdmin PDF output' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__table_info`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__table_info` (
-		`db_name` varchar(64) NOT NULL default '',
-		`table_name` varchar(64) NOT NULL default '',
-		`display_field` varchar(64) NOT NULL default '',
-		PRIMARY KEY (`db_name`, `table_name`)
-	) COMMENT = 'Table information for phpMyAdmin' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__tracking`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__tracking` (
-		`db_name` varchar(64) NOT NULL,
-		`table_name` varchar(64) NOT NULL,
-		`version` int (10) unsigned NOT NULL,
-		`date_created` datetime NOT NULL,
-		`date_updated` datetime NOT NULL,
-		`schema_snapshot` text NOT NULL,
-		`schema_sql` text,
-		`data_sql` longtext,
-		`tracking`
-		set
-			(
-				'UPDATE',
-				'REPLACE',
-				'INSERT',
-				'DELETE',
-				'TRUNCATE',
-				'CREATE DATABASE',
-				'ALTER DATABASE',
-				'DROP DATABASE',
-				'CREATE TABLE',
-				'ALTER TABLE',
-				'RENAME TABLE',
-				'DROP TABLE',
-				'CREATE INDEX',
-				'DROP INDEX',
-				'CREATE VIEW',
-				'ALTER VIEW',
-				'DROP VIEW'
-			) default NULL,
-			`tracking_active` int (1) unsigned NOT NULL default '1',
-			PRIMARY KEY (`db_name`, `table_name`, `version`)
-	) COMMENT = 'Database changes tracking for phpMyAdmin' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__userconfig`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__userconfig` (
-		`username` varchar(64) NOT NULL,
-		`timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-		`config_data` text NOT NULL,
-		PRIMARY KEY (`username`)
-	) COMMENT = 'User preferences storage for phpMyAdmin' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__users`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__users` (
-		`username` varchar(64) NOT NULL,
-		`usergroup` varchar(64) NOT NULL,
-		PRIMARY KEY (`username`, `usergroup`)
-	) COMMENT = 'Users and their assignments to user groups' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__usergroups`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__usergroups` (
-		`usergroup` varchar(64) NOT NULL,
-		`tab` varchar(64) NOT NULL,
-		`allowed` enum ('Y', 'N') NOT NULL DEFAULT 'N',
-		PRIMARY KEY (`usergroup`, `tab`, `allowed`)
-	) COMMENT = 'User groups with configured menu items' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__navigationhiding`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__navigationhiding` (
-		`username` varchar(64) NOT NULL,
-		`item_name` varchar(64) NOT NULL,
-		`item_type` varchar(64) NOT NULL,
-		`db_name` varchar(64) NOT NULL,
-		`table_name` varchar(64) NOT NULL,
-		PRIMARY KEY (
-			`username`,
-			`item_name`,
-			`item_type`,
-			`db_name`,
-			`table_name`
-		)
-	) COMMENT = 'Hidden items of navigation tree' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__savedsearches`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__savedsearches` (
-		`id` int (5) unsigned NOT NULL auto_increment,
-		`username` varchar(64) NOT NULL default '',
-		`db_name` varchar(64) NOT NULL default '',
-		`search_name` varchar(64) NOT NULL default '',
-		`search_data` text NOT NULL,
-		PRIMARY KEY (`id`),
-		UNIQUE KEY `u_savedsearches_username_dbname` (`username`, `db_name`, `search_name`)
-	) COMMENT = 'Saved searches' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__central_columns`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__central_columns` (
-		`db_name` varchar(64) NOT NULL,
-		`col_name` varchar(64) NOT NULL,
-		`col_type` varchar(64) NOT NULL,
-		`col_length` text,
-		`col_collation` varchar(64) NOT NULL,
-		`col_isNull` boolean NOT NULL,
-		`col_extra` varchar(255) default '',
-		`col_default` text,
-		PRIMARY KEY (`db_name`, `col_name`)
-	) COMMENT = 'Central list of columns' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__designer_settings`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__designer_settings` (
-		`username` varchar(64) NOT NULL,
-		`settings_data` text NOT NULL,
-		PRIMARY KEY (`username`)
-	) COMMENT = 'Settings related to Designer' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
---
--- Table structure for table `pma__export_templates`
---
-CREATE TABLE
-	IF NOT EXISTS `pma__export_templates` (
-		`id` int (5) unsigned NOT NULL AUTO_INCREMENT,
-		`username` varchar(64) NOT NULL,
-		`export_type` varchar(10) NOT NULL,
-		`template_name` varchar(64) NOT NULL,
-		`template_data` text NOT NULL,
-		PRIMARY KEY (`id`),
-		UNIQUE KEY `u_user_type_template` (`username`, `export_type`, `template_name`)
-	) COMMENT = 'Saved export templates' DEFAULT CHARACTER
-SET
-	utf8 COLLATE utf8_bin;

install/deb/phpmyadmin/hestia-sso.php

@@ -1,213 +0,0 @@
-<?php
-
-/* Hestia way to enable support for SSO to PHPmyAdmin */
-/* To install please run v-add-sys-pma-sso */
-
-/* Following keys will get replaced when calling v-add-sys-pma-sso */
-define("PHPMYADMIN_KEY", "%PHPMYADMIN_KEY%");
-define("API_HOST_NAME", "%API_HOST_NAME%");
-define("API_HESTIA_PORT", "%API_HESTIA_PORT%");
-define("API_KEY", "%API_KEY%");
-
-class Hestia_API {
-	/** @var string */
-	public $hostname;
-	/** @var string */
-	public $key;
-	/** @var string */
-	public $pma_key;
-	/** @var string */
-	private $api_url;
-	public function __construct() {
-		$this->hostname = "https://" . API_HOST_NAME . ":" . API_HESTIA_PORT . "/api/";
-		$this->key = API_KEY;
-		$this->pma_key = PHPMYADMIN_KEY;
-	}
-
-	/* Creates curl request */
-	public function request($postvars) {
-		$postdata = http_build_query($postvars);
-		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_URL, $this->hostname);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-		curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
-		curl_setopt($curl, CURLOPT_POST, true);
-		curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
-		$answer = curl_exec($curl);
-		return $answer;
-	}
-
-	/* Creates an new temp user in mysql */
-	public function create_temp_user($database, $user, $host) {
-		$post_request = [
-			"hash" => $this->key,
-			"returncode" => "no",
-			"cmd" => "v-add-database-temp-user",
-			"arg1" => $user,
-			"arg2" => $database,
-			"arg3" => "mysql",
-			"arg4" => $host,
-		];
-		$request = $this->request($post_request);
-		$json = json_decode($request);
-		if (json_last_error() == JSON_ERROR_NONE) {
-			return $json;
-		} else {
-			trigger_error("Unable to connect over API please check api connection", E_USER_WARNING);
-			return false;
-		}
-	}
-
-	/* Delete an new temp user in mysql */
-	public function delete_temp_user($database, $user, $dbuser, $host) {
-		$post_request = [
-			"hash" => $this->key,
-			"returncode" => "yes",
-			"cmd" => "v-delete-database-temp-user",
-			"arg1" => $user,
-			"arg2" => $database,
-			"arg3" => $dbuser,
-			"arg4" => "mysql",
-			"arg5" => $host,
-		];
-		$request = $this->request($post_request);
-		if (is_numeric($request) && $request == 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public function get_user_ip() {
-		// Saving user IPs to the session for preventing session hijacking
-		$user_combined_ip = [];
-		if ($_SERVER["REMOTE_ADDR"] != $_SERVER["SERVER_ADDR"]) {
-			$user_combined_ip[] = $_SERVER["REMOTE_ADDR"];
-		}
-		if (isset($_SERVER["HTTP_CLIENT_IP"])) {
-			$user_combined_ip .= "|" . $_SERVER["HTTP_CLIENT_IP"];
-		}
-		if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) {
-			if ($_SERVER["REMOTE_ADDR"] != $_SERVER["HTTP_X_FORWARDED_FOR"]) {
-				$user_combined_ip[] = $_SERVER["HTTP_X_FORWARDED_FOR"];
-			}
-		}
-		if (isset($_SERVER["HTTP_FORWARDED_FOR"])) {
-			if ($_SERVER["REMOTE_ADDR"] != $_SERVER["HTTP_FORWARDED_FOR"]) {
-				$user_combined_ip[] = $_SERVER["HTTP_FORWARDED_FOR"];
-			}
-		}
-		if (isset($_SERVER["HTTP_X_FORWARDED"])) {
-			if ($_SERVER["REMOTE_ADDR"] != $_SERVER["HTTP_X_FORWARDED"]) {
-				$user_combined_ip[] = $_SERVER["HTTP_X_FORWARDED"];
-			}
-		}
-		if (isset($_SERVER["HTTP_FORWARDED"])) {
-			if ($_SERVER["REMOTE_ADDR"] != $_SERVER["HTTP_FORWARDED"]) {
-				$user_combined_ip[] = "|" . $_SERVER["HTTP_FORWARDED"];
-			}
-		}
-		if (isset($_SERVER["HTTP_CF_CONNECTING_IP"])) {
-			if (!empty($_SERVER["HTTP_CF_CONNECTING_IP"])) {
-				$user_combined_ip[] = $_SERVER["HTTP_CF_CONNECTING_IP"];
-			}
-		}
-		return implode("|", $user_combined_ip);
-	}
-}
-
-function verify_token($database, $user, $ip, $time, $token) {
-	if (!password_verify($database . $user . $ip . $time . PHPMYADMIN_KEY, $token)) {
-		if (
-			!password_verify(
-				$database . $user . $_SERVER["SERVER_ADDR"] . "|" . $ip . $time . PHPMYADMIN_KEY,
-				$token,
-			)
-		) {
-			trigger_error(
-				"Access denied: There is a security token mismatch " . $time,
-				E_USER_WARNING,
-			);
-			session_invalid();
-		}
-	}
-	return;
-}
-/* Need to have cookie visible from parent directory */
-session_set_cookie_params(0, "/", "", true, true);
-/* Create signon session */
-$session_name = "SignonSession";
-session_name($session_name);
-@session_start();
-
-function session_invalid() {
-	global $session_name;
-	//delete all current sessions
-	session_destroy();
-	setcookie($session_name, null, -1, "/");
-	header("Location: " . dirname($_SERVER["PHP_SELF"]) . "/index.php");
-	die();
-}
-
-$api = new Hestia_API();
-if (!empty($_GET)) {
-	if (isset($_GET["logout"])) {
-		$api->delete_temp_user(
-			$_SESSION["HESTIA_sso_database"],
-			$_SESSION["HESTIA_sso_user"],
-			$_SESSION["PMA_single_signon_user"],
-			$_SESSION["HESTIA_sso_host"],
-		);
-		//remove session
-		session_invalid();
-	} else {
-		if (isset($_GET["user"]) && isset($_GET["hestia_token"])) {
-			$database = $_GET["database"];
-			$user = $_GET["user"];
-			$host = "localhost";
-			$token = $_GET["hestia_token"];
-			if (is_numeric($_GET["exp"])) {
-				$time = $_GET["exp"];
-			} else {
-				$time = 0;
-			}
-
-			if ($time + 60 > time()) {
-				//note: Possible issues with cloudflare due to ip obfuscation
-				$ip = $api->get_user_ip();
-				verify_token($database, $user, $ip, $time, $token);
-				$id = session_id();
-				//create a new temp user
-				$data = $api->create_temp_user($database, $user, $host);
-				if ($data) {
-					$_SESSION["PMA_single_signon_user"] = $data->login->user;
-					$_SESSION["PMA_single_signon_password"] = $data->login->password;
-					$_SESSION["PMA_single_signon_host"] = $host;
-					//save database / username to be used for sending logout notification.
-					$_SESSION["HESTIA_sso_user"] = $user;
-					$_SESSION["HESTIA_sso_database"] = $database;
-					$_SESSION["HESTIA_sso_host"] = $host;
-
-					@session_write_close();
-					setcookie($session_name, $id, 0, "/");
-					header("Location: " . dirname($_SERVER["PHP_SELF"]) . "/index.php");
-					die();
-				} else {
-					session_invalid();
-				}
-			} else {
-				trigger_error(
-					"Link has been expired: System time: " .
-						time() .
-						" / Time provided in link: " .
-						$time,
-					E_USER_WARNING,
-				);
-				session_invalid();
-			}
-		}
-	}
-} else {
-	session_invalid();
-}

install/deb/phpmyadmin/pma.sh

@@ -1,103 +0,0 @@
-#!/bin/bash
-#
-# phpmyadmin-fixer
-#
-# Fixes for phpmyadmin (configuration storage and some extended features)
-#
-# Original Version by Pavel Galkin (https://skurudo.ru)
-# https://github.com/skurudo/phpmyadmin-fixer
-#
-# Changed some lines to fit to Hestia Configuration.
-#
-
-PASS=$(gen_pass)
-
-#ubuntu phpmyadmin path
-pmapath="/etc/phpmyadmin/conf.d/01-localhost.php"
-echo "<?php " >> $pmapath
-echo "\$cfg['Servers'][\$i]['host'] = 'localhost';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['port'] = '3306';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath
-echo "\$cfg['Servers'][\$i]['hide_db'] = 'information_schema';" >> $pmapath
-
-#SOME WORK with DATABASE (table / user)
-PMADB=phpmyadmin
-PMAUSER=pma
-
-#DROP USER and TABLE
-#mysql -uroot <<MYSQL_PMA1
-#DROP USER '$PMAUSER'@'localhost';
-#DROP DATABASE $PMADB;
-#FLUSH PRIVILEGES;
-#MYSQL_PMA1
-
-#CREATE PMA USER
-if [ -f '/usr/bin/mariadb' ]; then
-	mysql_server="mariadb"
-else
-	mysql_server="mysql"
-fi
-mysql_out=$(mktemp)
-$mysql -e 'SELECT VERSION()' > $mysql_out
-mysql_ver=$(cat $mysql_out | tail -n1 | cut -f 1 -d -)
-mysql_ver_sub=$(echo $mysql_ver | cut -d '.' -f1)
-mysql_ver_sub_sub=$(echo $mysql_ver | cut -d '.' -f2)
-
-if [ "$mysql" = "mysql" ] && [ "$mysql_ver_sub" -ge 8 ]; then
-	query="CREATE USER '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-	query="CREATE DATABASE $PMADB;"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-	query="GRANT USAGE ON $PMADB.* TO '$PMAUSER'@'localhost';"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-	query="GRANT ALL PRIVILEGES ON $PMADB.* TO '$PMAUSER'@'localhost';"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-	query="FLUSH PRIVILEGES;"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-else
-	query="CREATE USER '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-	query="CREATE DATABASE $PMADB;"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-	query="GRANT USAGE ON $PMADB.* TO '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-	query="GRANT ALL PRIVILEGES ON $PMADB.* TO '$PMAUSER'@'localhost';"
-	$mysql_server -uroot -e "$query" > /dev/null
-
-	query="FLUSH PRIVILEGES;"
-	$mysql_server -uroot -e "$query" > /dev/null
-fi
-
-#MYSQL DB and TABLES ADDITION
-$mysql_server -uroot < "$HESTIA_INSTALL_DIR/phpmyadmin/create_tables.sql"

install/deb/pma/apache.conf

@@ -1,40 +0,0 @@
-# phpMyAdmin default Apache configuration
-
-Alias /%pma_alias% /usr/share/phpmyadmin
-
-<Directory /usr/share/phpmyadmin>
-	Options FollowSymLinks
-	DirectoryIndex index.php
-    <IfModule mpm_event_module>
-        # Use www.conf instead
-        <FilesMatch \.php$>
-            SetHandler "proxy:fcgi://127.0.0.1:9000"
-        </FilesMatch>
-    </IfModule>
-</Directory>
-
-# Disallow web access to directories that don't need it
-<Directory /usr/share/phpmyadmin/libraries>
-    Order Deny,Allow
-    Deny from All
-</Directory>
-<Directory /usr/share/phpmyadmin/setup>
-    Order Deny,Allow
-    Deny from All
-</Directory>
-<Directory /usr/share/phpmyadmin/sql>
-    Order Deny,Allow
-    Deny from All
-</Directory>
-<Directory /usr/share/phpmyadmin/vendor>
-    Order Deny,Allow
-    Deny from All
-</Directory>
-<Directory /usr/share/phpmyadmin/templates>
-    Order Deny,Allow
-    Deny from All
-</Directory>
-<Directory /usr/share/phpmyadmin/locale>
-    Order Deny,Allow
-    Deny from All
-</Directory>

install/deb/postgresql/pg_hba.conf

@@ -1,11 +0,0 @@
-# "local" is for Unix domain socket connections only
-local   all         all                               ident
-
-# IPv4 local connections:
-host    all         all         127.0.0.1/32          md5
-
-# IPv6 local connections:
-host    all         all         ::1/128               md5
-
-# Others
-host    all         all         0.0.0.0/0             md5

install/deb/proftpd/proftpd.conf

@@ -1,33 +0,0 @@
-ServerName                      "FTP"
-ServerIdent                     on "FTP Server ready."
-ServerAdmin                     root@localhost
-DefaultServer                   on
-DefaultRoot                  ~ !adm
-
-Include /etc/proftpd/tls.conf
-
-<IfModule mod_vroot.c>
-    VRootEngine                 on
-    VRootAlias                  /etc/security/pam_env.conf etc/security/pam_env.conf
-</IfModule>
-
-AuthPAMConfig                   proftpd
-AuthOrder                       mod_auth_pam.c* mod_auth_unix.c
-UseReverseDNS                   off
-User                            proftpd
-Group                           nogroup
-MaxInstances                    20
-UseSendfile                     off
-LogFormat                       default "%h %l %u %t \"%r\" %s %b"
-LogFormat                       auth    "%v [%P] %h %t \"%r\" %s"
-ListOptions                     -a
-RequireValidShell               off
-PassivePorts                    12000 12100
-
-<Global>
-  Umask                         002
-  AllowOverwrite                yes
-  <Limit ALL SITE_CHMOD>
-    AllowAll
-  </Limit>
-</Global>

install/deb/proftpd/tls.conf

@@ -1,65 +0,0 @@
-#
-# Proftpd sample configuration for FTPS connections.
-#
-# Note that FTPS impose some limitations in NAT traversing.
-# See http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-TLS.html
-# for more information.
-#
-<IfModule mod_dso.c>
-    # If mod_tls was built as a shared/DSO module, load it
-    LoadModule mod_tls.c
-</IfModule>
-<IfModule mod_tls.c>
-TLSEngine                               on
-TLSLog                                  /var/log/proftpd/tls.log
-# this is an example of protocols, proftp works witl all, but use only the most secure ones like TLSv1.1 and TLSv1.2
-TLSCipherSuite                          ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA256
-TLSProtocol                             TLSv1.2 TLSv1.3
-TLSServerCipherPreference               on
-#
-# Server SSL certificate. You can generate a self-signed certificate using
-# a command like:
-#
-# openssl req -x509 -newkey rsa:1024 \
-#          -keyout /etc/ssl/private/proftpd.key -out /etc/ssl/certs/proftpd.crt \
-#          -nodes -days 365
-#
-# The proftpd.key file must be readable by root only. The other file can be
-# readable by anyone.
-#
-# chmod 0600 /etc/ssl/private/proftpd.key
-# chmod 0640 /etc/ssl/private/proftpd.key
-#
-TLSRSACertificateFile                   /usr/local/hestia/ssl/certificate.crt
-TLSRSACertificateKeyFile                /usr/local/hestia/ssl/certificate.key
-#
-# CA the server trusts...
-#TLSCACertificateFile                    /etc/ssl/certs/CA.pem
-# ...or avoid CA cert and be verbose
-#TLSOptions                      NoCertRequest EnableDiags
-# ... or the same with relaxed session use for some clients (e.g. FireFtp)
-#TLSOptions                      NoCertRequest EnableDiags NoSessionReuseRequired
-#
-#
-# Per default drop connection if client tries to start a renegotiate
-# This is a fix for CVE-2009-3555 but could break some clients.
-#
-#TLSOptions                      AllowClientRenegotiations
-#
-TLSOptions                      NoSessionReuseRequired AllowClientRenegotiations
-# Authenticate clients that want to use FTP over TLS?
-#
-#TLSVerifyClient                         off
-#
-# Are clients required to use FTP over TLS when talking to this server?
-#
-TLSRequired                             off
-#
-# Allow SSL/TLS renegotiations when the client requests them, but
-# do not force the renegotations.  Some clients do not support
-# SSL/TLS renegotiations; when mod_tls forces a renegotiation, these
-# clients will close the data connection, or there will be a timeout
-# on an idle data connection.
-#
-TLSRenegotiate                          required off
-</IfModule>

install/deb/ssl/dhparam.pem

@@ -1,13 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIICCAKCAgEA7N3ZOcXgACR0Rat9G/7h8krD7ysVvmEmvAdg8o5l7eKVdtp/QSNK
-anF0JyInJMBEgq05GY7YwvFovglJL73T/eEjTK3qPU6eHzxNGKfR0pM6rnAb+EXL
-dSNJm3Xz9wH4IKn6OJ3nD9aLmBVI5FlIMV1R4QKX3sIWUxRqRSQIzjNQTnY1e/Pk
-BT/ZrUUF7fPPVbg0nPD8Y48ISr7pB6M14Kr66cggGIqUVdBdkPYyt4RpFWR1n3Tv
-rz1j0U+UoVnan2FgGsSiSFT9I/CiIxgC/SrdwxZLUgbAiKsnw9H7nGW92C4cRqY0
-2eKMVNEBk32GSPQXaA+Q5TILyzxuwDbXMxHMxnUVKQGFEcXjWXXyiv7tLAeu68Do
-j5iNFOHbDp17SftnxYHi2vTsYk+9K6Pzc+NmUgibM52Rs92PPYd++HcgMeGrYcqi
-temHP2jPtAymixch0wdqBMgeGTb29w51LR0BAU6D6BeR25pkZvPUag3bb6SU1Oli
-E15DDWh3UnmfTw2M9W1uxlzQAlXOLL6/ZWuvwyqhCY6X7tIONtSgdYGjtiTFaPJp
-ZBdOOrblodLxSu0ObR59SFjv8Pz3sTw4xiRFTG3lFtuIVHdBUbtJHR+2p4fHy/JG
-Ccs+Z1KrmJfEzSMzKwfvZYJ526demNulglFBbcQV06ehqjc6MCG3HnMCAQI=
------END DH PARAMETERS-----

install/deb/sudo/admin

@@ -1,10 +0,0 @@
-# Created by hestia installer
-Defaults env_keep="VESTA"
-Defaults env_keep+="HESTIA"
-Defaults:admin !syslog
-Defaults:admin !requiretty
-Defaults:root !requiretty
-
-# sudo is limited to hestia scripts
-admin   ALL=NOPASSWD:/usr/local/vesta/bin/*
-admin   ALL=NOPASSWD:/usr/local/hestia/bin/*

install/deb/templates/mail/apache2/rainloop.tpl

@@ -1,25 +0,0 @@
-<VirtualHost %ip%:%web_port%>
-    ServerName %domain_idn%
-    ServerAlias %alias_idn%
-    Alias / /var/lib/rainloop/
-    Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
-    #SuexecUserGroup %user% %group%
-
-    IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf*
-
-    <Directory /var/lib/rainloop/>
-        Options +FollowSymLinks
-        # This is needed to parse /var/lib/rainloop/.htaccess. See its
-        # content before setting AllowOverride to None.
-        AllowOverride All
-        order allow,deny
-        allow from all
-    </Directory>
-
-    # Protecting basic directories:
-    <Directory /var/lib/rainloop/data>
-            Options -FollowSymLinks
-            AllowOverride None
-    </Directory>
-    IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*
-</VirtualHost>