opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 31b280ec82 - Show all commits

1
sco_version.py
View File

@ -12,6 +12,7 @@ SCONEWS = """
<li>ScoDoc 9.6 (juillet 2023)</li> <li>ScoDoc 9.6 (juillet 2023)</li>
<ul> <ul>
<li>Nouvelle gestion des absences et assiduité</li> <li>Nouvelle gestion des absences et assiduité</li>
<li>Mise à jour logiciels: Debian 12, Python 3.11, ...</li>
</ul> </ul>
<li>ScoDoc 9.5 (juillet 2023)</li> <li>ScoDoc 9.5 (juillet 2023)</li>

6
tools/config.sh
View File

@ -40,10 +40,10 @@ export SCODOC_DB_TEST="SCODOC_TEST"
# psql command: if various versions installed, force the one we want: # psql command: if various versions installed, force the one we want:
if [ "${debian_version}" = "11" ] if [ "${debian_version}" = "12" ]
then then
PSQL=/usr/lib/postgresql/13/bin/psql PSQL=/usr/lib/postgresql/15/bin/psql
export POSTGRES_SERVICE="postgresql@11-main.service" #export POSTGRES_SERVICE="postgresql@11-main.service"
else else
die "unsupported Debian version" die "unsupported Debian version"
fi fi