fix spaces

This commit is contained in:
Dmitry Belyaev 2023-05-16 23:44:00 +03:00
parent d92d4e4400
commit 1c9c22477c
1 changed files with 7 additions and 8 deletions

View File

@ -172,14 +172,14 @@ autoinstall:
# --- force apt update ---
- |
set -x
set -x
apt-get update
apt-get -y dist-upgrade
apt-get clean
# --- install hasp ---
- |
set -x
set -x
mkdir -p /tmp/ldk
curl -SLo /tmp/ldk/installer.tar.gz https://b4tman.ru/_static/Sentinel_LDK_Ubuntu_DEB_Runtime_Installer.tar.gz
tar xzf /tmp/ldk/installer.tar.gz --strip-components=1 -C /tmp/ldk
@ -197,7 +197,7 @@ autoinstall:
# --- install postgres ---
- |
set -x
set -x
curl -SLo /tmp/pgpro-repo-add.sh https://repo.postgrespro.ru/1c-15/keys/pgpro-repo-add.sh
sh /tmp/pgpro-repo-add.sh
rm -f /tmp/pgpro-repo-add.sh
@ -205,7 +205,7 @@ autoinstall:
# --- postgres init ---
- |
set -x
set -x
echo postgres > /tmp/pgpswd
/opt/pgpro/1c-15/bin/pg-setup initdb --tune=1c -k -E UTF8 -g --locale ru_RU.UTF-8 -T russian --pwfile=/tmp/pgpswd
rm -f /tmp/pgpswd
@ -246,7 +246,7 @@ autoinstall:
# --- 1c web init ---
- |
set -x
set -x
# stop services
systemctl stop apache2
systemctl stop nginx
@ -262,7 +262,7 @@ autoinstall:
sed -i 's%VirtualHost\s\*\:80%VirtualHost\ \*\:33380%' /etc/apache2/sites-available/001-1c.conf
sed -i 's%DocumentRoot\s\/var\/www\/html%DocumentRoot \/var\/www-1c\/html%' /etc/apache2/sites-available/001-1c.conf
sed -i 's%\#Include.*$%Include /etc/apache2/conf-available/1c.conf%' /etc/apache2/sites-available/001-1c.conf
# load 1c handler module
# load 1c handler module
echo LoadModule _1cws_module "/opt/1cv8/x86_64/current/wsap24.so" >> /etc/apache2/conf-available/1c.conf
# allow www root
echo \<Directory\ \"/var/www-1c/html\"\> >> /etc/apache2/conf-available/1c.conf
@ -291,7 +291,7 @@ autoinstall:
# --- install & config webpub1c ---
- |
set -x
set -x
sudo -u admin1c sh -exc "git clone --branch v0.0.1 https://github.com/b4tman/webpub1c /home/admin1c/webpub1c && cd /home/admin1c/webpub1c && virtualenv venv && . venv/bin/activate && pip install -r requirements.txt"
sed -i "s%apache_config:.*\$%apache_config: /etc/apache2/conf-available/1c.conf%" /home/admin1c/webpub1c/webpub1c.yml
mkdir -p /var/www-1c/vrd
@ -343,7 +343,6 @@ autoinstall:
sudo -u admin1c sh -exc "cd /home/admin1c/webpub1c && . venv/bin/activate && python webpub1c.py add_module && python webpub1c.py add test1 && python webpub1c.py add test2 && python webpub1c.py add test3"
systemctl restart apache2
# --- final ---
- |
set -x