Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.2.10 #49

Merged
merged 1 commit into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ jobs:
tag_name: ${{ env.VERSION }}
release_name: ${{ env.VERSION }}
body: |
Added dependencies
Various fixes
- Various output fixes
draft: false
prerelease: false

Expand Down
6 changes: 3 additions & 3 deletions mods-available/agent/reposerver.agent
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function send_general_status {
if [ $? != "0" ];then
echo -e "An error occured while sending data\n"
else
echo -e "Data have been send\n"
echo -e "Data have been sent\n"
fi
}

Expand All @@ -102,7 +102,7 @@ function send_packages_status {
if [ $? != "0" ];then
echo -e "An error occured while sending data\n"
else
echo -e "Data have been send\n"
echo -e "Data have been sent\n"
fi
}

Expand All @@ -112,7 +112,7 @@ function send_full_status {
if [ $? != "0" ];then
echo -e "An error occured while sending data\n"
else
echo -e "Data have been send\n"
echo -e "Data have been sent\n"
fi
}

Expand Down
7 changes: 4 additions & 3 deletions mods-available/reposerver.mod
Original file line number Diff line number Diff line change
Expand Up @@ -794,12 +794,12 @@ function getProfileConf
done

if [ "$GET_PROFILE_PKG_CONF_FROM_REPOSERVER" == "null" ];then
echo -e "[$YELLOW ERROR $RESET] Server send ${YELLOW}null${RESET} data"
echo -e "[$YELLOW ERROR $RESET] Server sent ${YELLOW}null${RESET} data"
return 2
fi

if [ "$GET_PROFILE_REPOS_FROM_REPOSERVER" == "null" ];then
echo -e "[$YELLOW ERROR $RESET] Server send ${YELLOW}null${RESET} data"
echo -e "[$YELLOW ERROR $RESET] Server sent ${YELLOW}null${RESET} data"
return 2
fi

Expand Down Expand Up @@ -911,7 +911,7 @@ function getProfileRepos
# On s'assure que le paramètre 'configuraiton' fait bien partie de la réponse JSON renvoyée par le serveur
# Ce paramètre peut être vide toutefois si la configuration du profil côté serveur n'a aucun repo de configuré
if ! echo "$CURL" | grep -q "results";then
echo -e "[$YELLOW ERROR $RESET] $PROFILE profile repos sources configuration have not been sended by reposerver."
echo -e "[$YELLOW ERROR $RESET] $PROFILE profile repos sources configuration have not been sent by reposerver."
return 2
fi

Expand All @@ -932,6 +932,7 @@ function getProfileRepos
rm /etc/yum.repos.d/*.repo -f
fi
if [ "$OS_FAMILY" == "Debian" ];then
echo -n> /etc/apt/sources.list
rm /etc/apt/sources.list.d/*.list -f
fi

Expand Down
2 changes: 1 addition & 1 deletion service/linupdate-agent
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AGENTS_ENABLED_DIR="/opt/linupdate/agents-enabled"
sleep 60

# On vérifie qu'au moins 1 agent est activé
if ls -A $AGENTS_ENABLED_DIR/* > /dev/null;then
if ls -A $AGENTS_ENABLED_DIR/* 2> /dev/null;then
# Inclusion de tous les 'modules agent'
for AGENT in $(ls -A1 ${AGENTS_ENABLED_DIR}/);do
source "${AGENTS_ENABLED_DIR}/${AGENT}"
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.9
2.2.10