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

Quelques corrections #160

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ que `root`), `monuser` dans l'exemple :

```
cd /home/<monuser>
wget https://github.com/PnX-SI/GeoPaysages/archive/X.Y.Z.zip
wget https://github.com/PnX-SI/GeoPaysages/archive/vX.Y.Z.zip
```

> Si la commande `wget` renvoie une erreur liée au certificat, installer le paquet `ca-certificates` (`sudo apt-get install ca-certificates`) puis relancer la commande `wget` ci-dessus.

Dézipper l'archive :

```
unzip X.Y.Z.zip
unzip vX.Y.Z.zip
```

Vous pouvez renommer le dossier qui contient l'application (dans un
Expand Down
12 changes: 6 additions & 6 deletions install_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ then
wget https://raw.githubusercontent.com/PnX-SI/UsersHub/$usershub_release/data/usershub-data.sql -P /tmp
wget https://raw.githubusercontent.com/PnX-SI/UsersHub/$usershub_release/data/usershub-dataset.sql -P /tmp
cp install_configuration/usershub_adds.sql /tmp/usershub_adds.sql
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub-data.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub-dataset.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub_adds.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub-data.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub-dataset.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub_adds.sql &>> $DBLogFile
else
echo "Connexion à la base Utilisateur..."
cp install_configuration/usershub_fdw.sql /tmp/usershub_fdw.sql
Expand All @@ -79,11 +79,11 @@ then
sed -i "s#\$usershub_user#$usershub_user#g" /tmp/usershub_fdw.sql
sed -i "s#\$usershub_pass#$usershub_pass#g" /tmp/usershub_fdw.sql
sudo -u postgres -s psql -d $db_name -f /tmp/usershub_fdw.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub_fdw_import.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub_fdw_import.sql &>> $DBLogFile
fi

echo "Création de la BDD de GeoPaysages..."
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/oppdb.sql &>> $DBLogFile
export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/oppdb.sql &>> $DBLogFile

echo "Fin... Vérifiez le fichier de log !"

Expand Down