Skip to content

Commit f920400

Browse files
mattiagiupponigiohappy
authored andcommitted
change from manage.sh to django-admin, minor typos on the project name
1 parent 1dfd6a5 commit f920400

5 files changed

Lines changed: 14 additions & 16 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ docker system prune -a
142142
### Run a Backup
143143

144144
```bash
145-
SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/backup.sh $BKP_FOLDER_NAME
145+
SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./geonode_project/br/backup.sh $BKP_FOLDER_NAME
146146
```
147147

148148
- BKP_FOLDER_NAME:
@@ -159,13 +159,13 @@ SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/backup.sh $BKP_FOLDER
159159
e.g.:
160160

161161
```bash
162-
docker exec -it django4project sh -c 'SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/backup.sh $BKP_FOLDER_NAME'
162+
docker exec -it django4geonode_project sh -c 'SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./geonode_project/br/backup.sh $BKP_FOLDER_NAME'
163163
```
164164

165165
### Run a Restore
166166

167167
```bash
168-
SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/restore.sh $BKP_FOLDER_NAME
168+
SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./geonode_project/br/restore.sh $BKP_FOLDER_NAME
169169
```
170170

171171
- BKP_FOLDER_NAME:
@@ -182,7 +182,7 @@ SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/restore.sh $BKP_FOLDE
182182
e.g.:
183183

184184
```bash
185-
docker exec -it django4project sh -c 'SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/restore.sh $BKP_FOLDER_NAME'
185+
docker exec -it django4geonode_project sh -c 'SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./geonode_project/br/restore.sh $BKP_FOLDER_NAME'
186186
```
187187

188188
## Recommended: Track your changes

src/geonode_project/br/backup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# ##########################################################
33
# Run a backup
4-
# SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/backup.sh $BKP_FOLDER_NAME
4+
# SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./geonode_project/br/backup.sh $BKP_FOLDER_NAME
55
# - BKP_FOLDER_NAME:
66
# Default value = backup_restore
77
# Shared Backup Folder name.
@@ -14,7 +14,7 @@
1414
# Target Server URL, the one which must be synched.
1515
#
1616
# e.g.:
17-
# docker exec -it django4project sh -c 'SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/backup.sh $BKP_FOLDER_NAME'
17+
# docker exec -it django4geonode_project sh -c 'SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./geonode_project/br/backup.sh $BKP_FOLDER_NAME'
1818
# ##########################################################
1919

2020
# Exit script in case of error
@@ -32,7 +32,7 @@ fi
3232

3333
cd /usr/src/project/
3434

35-
./manage.sh backup -i -f -c $PWD/geonode_project/br/settings_docker.ini --backup-dir /$BKP_FOLDER_NAME/
35+
django-admin backup -i -f -c $PWD/geonode_project/br/settings_docker.ini --backup-dir /$BKP_FOLDER_NAME/
3636

3737
BKP_FILE_LATEST=$(find /$BKP_FOLDER_NAME/*.zip -type f -exec stat -c '%Y %n' {} \; | sort -nr | awk 'NR==1,NR==1 {print $2}')
3838
BKP_FILE_NAME=$(echo $BKP_FILE_LATEST | tail -n 1 | grep -oP -m 1 "\/$BKP_FOLDER_NAME\/\K.*" | sed 's|.zip||')

src/geonode_project/br/restore.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# ##########################################################
33
# Run a restore
4-
# SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/restore.sh $BKP_FOLDER_NAME
4+
# SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./geonode_project/br/restore.sh $BKP_FOLDER_NAME
55
# - BKP_FOLDER_NAME:
66
# Default value = backup_restore
77
# Shared Backup Folder name.
@@ -14,7 +14,7 @@
1414
# Target Server URL, the one which must be synched.
1515
#
1616
# e.g.:
17-
# docker exec -it django4project sh -c 'SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./project/br/restore.sh $BKP_FOLDER_NAME'
17+
# docker exec -it django4geonode_project sh -c 'SOURCE_URL=$SOURCE_URL TARGET_URL=$TARGET_URL ./geonode_project/br/restore.sh $BKP_FOLDER_NAME'
1818
# ##########################################################
1919

2020
# Exit script in case of error
@@ -71,10 +71,10 @@ if md5sum -c /$BKP_FOLDER_NAME/$NEW_UUID/$BKP_FILE_NAME.md5; then
7171

7272
if md5sum -c /$BKP_FOLDER_NAME/$BKP_FILE_NAME.md5; then
7373
# The MD5 sum matched
74-
./manage.sh restore -l -n -f --backup-file /$BKP_FOLDER_NAME/$BKP_FILE_NAME.zip --recovery-file /$BKP_FOLDER_NAME/$NEW_UUID/$RECOVERY_FILE_NAME.zip
75-
./manage.sh migrate_baseurl -f --source-address=$SOURCE_URL --target-address=$TARGET_URL
76-
./manage.sh create_tile_layers -f
77-
./manage.sh set_all_datasets_metadata -d -i
74+
django-admin restore -l -n -f --backup-file /$BKP_FOLDER_NAME/$BKP_FILE_NAME.zip --recovery-file /$BKP_FOLDER_NAME/$NEW_UUID/$RECOVERY_FILE_NAME.zip
75+
django-admin migrate_baseurl -f --source-address=$SOURCE_URL --target-address=$TARGET_URL
76+
django-admin create_tile_layers -f
77+
django-admin set_all_datasets_metadata -d -i
7878
echo "-----------------------------------------------------"
7979
echo " Fixup GeoServer styles"
8080
echo "-----------------------------------------------------"

src/manage.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/uwsgi.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ cheaper-busyness-max = 70 ; Above this threshold, spawn new workers
4040
cheaper-busyness-backlog-alert = 16 ; Spawn emergency workers if more than this many requests are waiting in the queue
4141
cheaper-busyness-backlog-step = 2 ; How many emergency workers to create if there are too many requests in the queue
4242

43-
# cron = -1 -1 -1 -1 -1 sh -c '/usr/src/project/manage.sh collect_metrics -n -t xml';
43+
# cron = -1 -1 -1 -1 -1 sh -c 'django-admin collect_metrics -n -t xml';
4444
# cron = 0 0 -1 -1 -1 sh -c 'find /backup_restore/ -type f -mtime +30 -exec rm -f {} \;'
4545
# Remove backup files older than 30 days except the most recent 3 files (a backup is composed by 3 files)
4646
cron = 0 0 -1 -1 -1 sh -c 'find /backup_restore/ -maxdepth 1 -type f -mtime +30 -printf "%T@ %p\n" | sort -n | head -n -3 | awk "{ print $2 }" | xargs -r rm'

0 commit comments

Comments
 (0)