martin/ProxmoxVE
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE synced 2025-02-07 00:09:18 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Address reviewer comments

Browse Source
This commit is contained in:
Gerhard Burger 2024-11-27 12:31:26 +01:00
parent 4c99c917bb
commit 302be583b6
2 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ct/outline.sh
View File

@ -57,8 +57,9 @@ header_info
check_container_storage check_container_storage
check_container_resources check_container_resources
if [[ ! -d /opt/outline ]]; then msg_error "No ${APP} Installation Found!"; exit; fi if [[ ! -d /opt/outline ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
RELEASE=$(curl -s https://api.github.com/repos/outline/outline/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') RELEASE_TAG=$(curl -s https://api.github.com/repos/outline/outline/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then RELEASE=${RELEASE_TAG#v}
if [[ "${RELEASE}" != "$(cat /opt/Outline_version.txt)" ]] || [[ ! -f /opt/Outline_version.txt ]]; then
msg_info "Stopping ${APP}" msg_info "Stopping ${APP}"
systemctl stop outline systemctl stop outline
msg_ok "Stopped ${APP}" msg_ok "Stopped ${APP}"
@ -67,20 +68,17 @@ if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}
cd /opt cd /opt
cp /opt/outline/.env /opt/.env cp /opt/outline/.env /opt/.env
mv /opt/outline /opt/outline_bak mv /opt/outline /opt/outline_bak
wget -q "https://github.com/outline/outline/archive/refs/tags/${RELEASE}.zip" wget -q "https://github.com/outline/outline/archive/refs/tags/${RELEASE_TAG}.zip"
unzip -q ${RELEASE}.zip unzip -q ${RELEASE_TAG}.zip
mv outline-${RELEASE:1} /opt/outline mv outline-${RELEASE} /opt/outline
cd /opt/outline cd /opt/outline
## Build in development mode yarn install --no-optional --frozen-lockfile &>/dev/null
unset NODE_ENV yarn cache clean &>/dev/null
yarn install --no-optional --frozen-lockfile &>/dev/null &&
yarn cache clean &>/dev/null &&
yarn build &>/dev/null yarn build &>/dev/null
## Continue in production mode
rm -rf ./node_modules rm -rf ./node_modules
yarn install --production=true--frozen-lockfile &>/dev/null && yarn install --production=true --frozen-lockfile &>/dev/null
yarn cache clean &>/dev/null yarn cache clean &>/dev/null
mv /opt/.env /opt/outline/.env mv /opt/.env /opt/outline/.env
@ -91,8 +89,9 @@ if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}
msg_info "Starting ${APP}" msg_info "Starting ${APP}"
systemctl start outline systemctl start outline
msg_ok "Started ${APP}" msg_ok "Started ${APP}"
msg_info "Cleaning up" msg_info "Cleaning up"
rm -rf /opt/${RELEASE}.zip rm -rf /opt/${RELEASE_TAG}.zip
rm -rf /opt/outline_bak rm -rf /opt/outline_bak
msg_ok "Cleaned" msg_ok "Cleaned"
msg_ok "Updated Successfully" msg_ok "Updated Successfully"

82
install/outline-install.sh
View File

@ -5,9 +5,6 @@
# License: MIT # License: MIT
# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
read -r -p "Enter the public url for your Outline instance (e.g., https://outline.your-domain.tld)): " URL
read -r -p "Would you like to add Adminer? <y/N> " adminer_prompt
source /dev/stdin <<< "$FUNCTIONS_FILE_PATH" source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
@ -19,6 +16,7 @@ update_os
msg_info "Installing Dependencies" msg_info "Installing Dependencies"
$STD apt-get install -y \ $STD apt-get install -y \
sudo \ sudo \
mc \
curl \ curl \
lsb-release \ lsb-release \
postgresql \ postgresql \
@ -61,49 +59,49 @@ $STD sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PAS
$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER WITH CREATEDB;" $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER WITH CREATEDB;"
$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC';" $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC';"
{ cat <<EOF >~/outline.creds
echo "Outline-Credentials" Outline-Credentials
echo "Outline Database User: $DB_USER" Outline Database User: $DB_USER
echo "Outline Database Password: $DB_PASS" Outline Database Password: $DB_PASS
echo "Outline Database Name: $DB_NAME" Outline Database Name: $DB_NAME
echo "Outline Secret: $SECRET_KEY" Outline Secret: $SECRET_KEY
echo "Outline Utils Secret: $UTILS_SECRET" Outline Utils Secret: $UTILS_SECRET
} >> ~/outline.creds EOF
msg_ok "Set up PostgreSQL DB" msg_ok "Set up PostgreSQL DB"
read -r -p "Would you like to add Adminer? <y/N> " adminer_prompt
if [[ "${adminer_prompt,,}" =~ ^(y|yes)$ ]]; then if [[ "${adminer_prompt,,}" =~ ^(y|yes)$ ]]; then
msg_info "Installing Adminer" msg_info "Installing Adminer"
$STD apt install -y adminer $STD apt install -y adminer
$STD a2enconf adminer $STD a2enconf adminer
systemctl reload apache2 systemctl reload apache2
IP=$(hostname -I | awk '{print $1}') IP=$(hostname -I | awk '{print $1}')
{ cat <<EOF >>~/outline.creds
echo "" Adminer Interface: $IP/adminer/
echo "Adminer Interface: $IP/adminer/" Adminer System: PostgreSQL
echo "Adminer System: PostgreSQL" Adminer Server: localhost:5432
echo "Adminer Server: localhost:5432" Adminer Username: $DB_USER
echo "Adminer Username: $DB_USER" Adminer Password: $DB_PASS
echo "Adminer Password: $DB_PASS" Adminer Database: $DB_NAME
echo "Adminer Database: $DB_NAME" EOF
} >> ~/outline.creds
msg_ok "Installed Adminer" msg_ok "Installed Adminer"
fi fi
msg_info "Installing $APPLICATION (Patience)" read -r -p "Enter the public url for your Outline instance (e.g., https://outline.your-domain.tld)): " URL
msg_info "Installing Outline (Patience)"
cd /opt cd /opt
RELEASE=$(curl -s https://api.github.com/repos/outline/outline/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') RELEASE_TAG=$(curl -s https://api.github.com/repos/outline/outline/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
wget -q "https://github.com/outline/outline/archive/refs/tags/${RELEASE}.zip" RELEASE=${RELEASE_TAG#v}
unzip -q ${RELEASE}.zip wget -q "https://github.com/outline/outline/archive/refs/tags/${RELEASE_TAG}.zip"
mv outline-${RELEASE:1} /opt/outline unzip -q ${RELEASE_TAG}.zip
mv outline-${RELEASE} /opt/outline
cd /opt/outline cd /opt/outline
## First build in development
$STD yarn install --no-optional --frozen-lockfile $STD yarn install --no-optional --frozen-lockfile
$STD yarn cache clean $STD yarn cache clean
$STD yarn build $STD yarn build
## Continue in production
rm -rf ./node_modules rm -rf ./node_modules
$STD yarn install --production=true --frozen-lockfile $STD yarn install --production=true --frozen-lockfile
$STD yarn cache clean $STD yarn cache clean
@ -111,24 +109,24 @@ $STD yarn cache clean
FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data
mkdir -p $FILE_STORAGE_LOCAL_ROOT_DIR mkdir -p $FILE_STORAGE_LOCAL_ROOT_DIR
{ cat <<EOF >/opt/outline/.env
echo NODE_ENV=production NODE_ENV=production
echo SECRET_KEY=$SECRET_KEY SECRET_KEY=$SECRET_KEY
echo UTILS_SECRET=$UTILS_SECRET UTILS_SECRET=$UTILS_SECRET
echo DATABASE_URL=$DATABASE_URL DATABASE_URL=$DATABASE_URL
echo REDIS_URL=redis://localhost:6379 REDIS_URL=redis://localhost:6379
echo URL=$URL URL=$URL
echo FILE_STORAGE=local FILE_STORAGE=local
echo FILE_STORAGE_LOCAL_ROOT_DIR=$FILE_STORAGE_LOCAL_ROOT_DIR FILE_STORAGE_LOCAL_ROOT_DIR=$FILE_STORAGE_LOCAL_ROOT_DIR
echo FILE_STORAGE_UPLOAD_MAX_SIZE=262144000 FILE_STORAGE_UPLOAD_MAX_SIZE=262144000
echo WEB_CONCURRENCY=2 WEB_CONCURRENCY=2
} > /opt/outline/.env EOF
$STD yarn sequelize db:create $STD yarn sequelize db:create
$STD yarn sequelize db:migrate $STD yarn sequelize db:migrate
echo "${RELEASE}" >/opt/${APPLICATION}_version.txt echo "${RELEASE}" >/opt/Outline_version.txt
msg_ok "Installed $APPLICATION" msg_ok "Installed Outline"
msg_info "Creating Service" msg_info "Creating Service"
cat <<EOF >/etc/systemd/system/outline.service cat <<EOF >/etc/systemd/system/outline.service
@ -151,7 +149,7 @@ motd_ssh
customize customize
msg_info "Cleaning up" msg_info "Cleaning up"
rm -rf /opt/${RELEASE}.zip rm /opt/${RELEASE_TAG}.zip
$STD apt-get -y autoremove $STD apt-get -y autoremove
$STD apt-get -y autoclean $STD apt-get -y autoclean
msg_ok "Cleaned" msg_ok "Cleaned"