Merge branch 'main' into add_python_scripts

refs #1689 - Add Convert IMG to VM
pull/31/head
Gerardo GIl Elizeire 2025-03-18 16:50:42 +01:00
commit 14fe0af2f6
2 changed files with 22 additions and 16 deletions

View File

@ -3,8 +3,8 @@ Description=Gunicorn instance to serve repo_api
After=network.target
[Service]
User=ogrepository
Group=ogrepository
User=%%OGREPOSITORY_USER%%
Group=%%OGREPOSITORY_USER%%
WorkingDirectory=/opt/opengnsys/ogrepository/api
ExecStart=/usr/bin/gunicorn -w 4 -b 0.0.0.0:8006 repo_api:app

View File

@ -6,8 +6,9 @@ GIT_BRANCH=$1
GIT_REPO=https://ognproject.evlt.uma.es/gitea/opengnsys/ogrepository.git
GIT_SSL_NO_VERIFY=true
REPO_IP=${REPO_IP:-"127.0.0.1"}
SMBUSER=${SMBUSER:-"ogrepository"}
SMBPASS=${SMBPASS:-"ogrepository"}
CORE_IP=${CORE_IP:-"127.0.0.1"}
OGUSER=${OGUSER:-"opengnsys"}
OGPASS=${OGPASS:-"og"}
INSTALL_DIR=/opt/opengnsys/ogrepository
DOWNLOAD_DIR=/tmp/ogrepository
DEBIAN_FRONTEND=noninteractive
@ -18,7 +19,7 @@ clone_repository() {
local BRANCH=$1
rm -rf $DOWNLOAD_DIR
git clone -b "$BRANCH" $GIT_REPO $DOWNLOAD_DIR
chown -R ogrepository:ogrepository $DOWNLOAD_DIR
chown -R $OGUSER:$OGUSER $DOWNLOAD_DIR
}
check_root() {
@ -30,6 +31,8 @@ check_root() {
install_uftp() {
apt install uftp -y
systemctl stop uftp
systemctl disable uftp
}
install_updcast () {
@ -37,13 +40,13 @@ install_updcast () {
}
add_user_ogrepository() {
if ! id "ogrepository" &>/dev/null; then
if ! id "$OGUSER" &>/dev/null; then
echo "User ogrepository does not exist, creating it"
useradd -r -s /bin/bash ogrepository
useradd -r -s /bin/bash $OGUSER
fi
if [ ! -f /etc/sudoers.d/ogrepository ]; then
echo "User ogrepository does not have sudo permissions, adding it"
echo 'ogrepository ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/ogrepository
if [ ! -f /etc/sudoers.d/$OGUSER ]; then
echo "User $OGUSER does not have sudo permissions, adding it"
echo "$OGUSER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/"$OGUSER"
fi
}
@ -51,12 +54,12 @@ add_user_ogrepository() {
create_directories() {
mkdir -p $INSTALL_DIR
mkdir -p $INSTALL_DIR/images $INSTALL_DIR/images_trash/ $INSTALL_DIR/bin/ $INSTALL_DIR/etc/ $INSTALL_DIR/log/ $INSTALL_DIR/api/
chown -R ogrepository:ogrepository $INSTALL_DIR
chown -R $OGUSER:$OGUSER $INSTALL_DIR
}
install_dependencies() {
apt update -y
apt install -y git python3 python3-pip python3-flask python3-paramiko python3-psutil python3-flasgger debian-archive-keyring samba gunicorn
apt install -y git python3 python3-pip python3-flask python3-paramiko python3-psutil python3-flasgger debian-archive-keyring samba gunicorn wakeonlan python3-requests
}
install_ext_repo() {
@ -70,6 +73,7 @@ install_external_packages() {
install_ogrepo-api_service() {
cp -r $DOWNLOAD_DIR/installer/files/ogrepo-api.service /etc/systemd/system/ogrepo-api.service
sed -i "s/%%OGREPOSITORY_USER%%/$OGUSER/g" /etc/systemd/system/ogrepo-api.service
systemctl enable --now ogrepo-api
}
@ -77,18 +81,20 @@ install_files() {
cp -pr $DOWNLOAD_DIR/bin/* $INSTALL_DIR/bin/
cp -pr $DOWNLOAD_DIR/etc/* $INSTALL_DIR/etc/
cp -pr $DOWNLOAD_DIR/api/* $INSTALL_DIR/api/
chown -R ogrepository:ogrepository $INSTALL_DIR
chown -R $OGUSER:$OGUSER $INSTALL_DIR
chmod 755 $INSTALL_DIR/bin/*
echo IPlocal="$REPO_IP" > $INSTALL_DIR/etc/ogAdmRepo.cfg
sudo chown ogrepository:ogrepository $INSTALL_DIR/etc/ogAdmRepo.cfg
echo IPcore="$CORE_IP" >> $INSTALL_DIR/etc/ogAdmRepo.cfg
sudo chown $OGUSER:$OGUSER $INSTALL_DIR/etc/ogAdmRepo.cfg
}
configure_samba() {
echo "include = /etc/samba/smb.conf.ogrepository" >> /etc/samba/smb.conf
cp $DOWNLOAD_DIR/installer/files/ogrepo-smb.conf /etc/samba/smb.conf.ogrepository
sed -i "s/%%OGREPOSITORY_USER%%/$SMBUSER/g" /etc/samba/smb.conf.ogrepository
sed -i "s/%%OGREPOSITORY_USER%%/$OGUSER/g" /etc/samba/smb.conf.ogrepository
systemctl restart smbd
# Create default user ogrepository
(echo $SMBPASS; echo $SMBPASS) | smbpasswd -s -a $SMBUSER
(echo $OGPASS; echo $OGPASS) | smbpasswd -s -a $OGUSER
}