summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-09-30 14:36:38 -0500
committerDan McGee <dan@archlinux.org>2010-09-30 14:36:38 -0500
commited6fbafb35ec9799ad182c45985355a2e0d67d50 (patch)
tree938f5c8105f2064c0bf08c46ab3a5ff12e338393
parentbb84f9c96cb9df4e47e517f424a28fc36b4bed28 (diff)
downloadarchweb-ed6fbafb35ec9799ad182c45985355a2e0d67d50.tar.gz
archweb-ed6fbafb35ec9799ad182c45985355a2e0d67d50.zip
Update MirrorProtocol fixture data
Move it to the correct location and add the new field. Also tidy up some of the instructions dealing with loading this data. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--README10
-rw-r--r--mirrors/fixtures/mirrorprotocols.json (renamed from main/fixtures/mirrorprotocols.json)19
2 files changed, 17 insertions, 12 deletions
diff --git a/README b/README
index fd493b68..e517ffe6 100644
--- a/README
+++ b/README
@@ -44,19 +44,21 @@ will probably want the following:
4. Sync the database to create it.
- $ python manage.py syncdb
+ $ ./manage.py syncdb
5. Migrate changes.
- $ python manage.py migrate
+ $ ./manage.py migrate
6. Load the fixtures to prepopulate some data.
- $ python manage.py loaddata main/fixtures/arches.json main/fixtures/repos.json
+ $ ./manage.py loaddata main/fixtures/arches.json
+ # ./manage.py loaddata main/fixtures/repos.json
+ # ./manage.py loaddata mirrors/fixtures/mirrorprotocols.json
7. Use the following commands to start a service instance
- $ python manage.py runserver
+ $ ./manage.py runserver
8. To optionally populate the database with real data:
diff --git a/main/fixtures/mirrorprotocols.json b/mirrors/fixtures/mirrorprotocols.json
index 9e8932a8..35614b3a 100644
--- a/main/fixtures/mirrorprotocols.json
+++ b/mirrors/fixtures/mirrorprotocols.json
@@ -1,23 +1,26 @@
[
{
- "pk": 2,
- "model": "main.mirrorprotocol",
+ "pk": 1,
+ "model": "mirrors.mirrorprotocol",
"fields": {
- "protocol": "ftp"
+ "is_download": true,
+ "protocol": "http"
}
},
{
- "pk": 1,
- "model": "main.mirrorprotocol",
+ "pk": 2,
+ "model": "mirrors.mirrorprotocol",
"fields": {
- "protocol": "http"
+ "is_download": true,
+ "protocol": "ftp"
}
},
{
"pk": 3,
- "model": "main.mirrorprotocol",
+ "model": "mirrors.mirrorprotocol",
"fields": {
+ "is_download": false,
"protocol": "rsync"
}
}
-]
+] \ No newline at end of file