diff --git a/.DS_Store b/.DS_Store index fa63948..5008ddf 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Compressed file.zip b/Compressed file.zip new file mode 100644 index 0000000..7715a29 Binary files /dev/null and b/Compressed file.zip differ diff --git a/Django_0917.pdf b/Django_0917.pdf new file mode 100644 index 0000000..490f805 Binary files /dev/null and b/Django_0917.pdf differ diff --git a/Django_Deploy/CSV_SQLite.md b/Django_Deploy/CSV_SQLite.md index 0d928dc..6cb4dc1 100644 --- a/Django_Deploy/CSV_SQLite.md +++ b/Django_Deploy/CSV_SQLite.md @@ -1,18 +1,18 @@ -##Create dataset +## Create dataset ``` ( echo 'a,b,c' ; echo '1,2,3' ) > somedata.csv ``` -##Import CSV +## Import CSV ``` sqlite3 database.sqlite3 .mode csv .import somedata.csv sometable ``` -##Select data +## Select data ``` SELECT * FROM sometable; ``` -##SQL Script Convert SQLite3 +## SQL Script Convert SQLite3 ``` sqlite3 database.sqlite3 < db.sql ``` diff --git a/Django_Deploy/Django_Service_Deploy.md b/Django_Deploy/Django_Service_Deploy.md index d5d20c5..70f679d 100644 --- a/Django_Deploy/Django_Service_Deploy.md +++ b/Django_Deploy/Django_Service_Deploy.md @@ -1,18 +1,18 @@ -#Deploy Django 1.7 with Python3 on Azure Ubuntu 14.04 +# Deploy Django 1.7 with Python3 on Azure Ubuntu 14.04 -##Virtual Environment -###python2 +## Virtual Environment +### python2 ``` sudo apt-get update sudo apt-get install python-pip apache2 libapache2-mod-wsgi ``` -###python3 +### python3 ``` sudo apt-get update sudo apt-get install python3-pip apache2 libapache2-mod-wsgi-py3 ``` -###Configure Virtual Environment +### Configure Virtual Environment ``` sudo pip install virtualenv mkdir myproject @@ -21,17 +21,17 @@ virtualenv myprojectenv source myprojectenv/bin/activate ``` -###Create Django Project +### Create Django Project ``` pip install "django<1.8" django-admin.py startproject myproject ``` -###Add a line to configure this directory. +### Add a line to configure this directory. ``` nano myproject/settings.py STATIC_ROOT = os.path.join(BASE_DIR, "static/") ``` -###Complete initial project +### Complete initial project ``` cd mysite ./manage.py makemigrations @@ -41,7 +41,7 @@ cd mysite ./manage.py runserver 0.0.0.0:8000 ``` -##Apache +## Apache ``` sudo nano /etc/apache2/sites-available/000-default.conf ``` diff --git a/Django_Deploy/PostgreSQL Troubleshooting b/Django_Deploy/PostgreSQL Troubleshooting index 0a76829..ac120b6 100644 --- a/Django_Deploy/PostgreSQL Troubleshooting +++ b/Django_Deploy/PostgreSQL Troubleshooting @@ -1,5 +1,5 @@ -####PostgreSQL Command Line and issue -##Drop Database Issue +#### PostgreSQL Command Line and issue +## Drop Database Issue ``` REVOKE CONNECT ON DATABASE TARGET_DB FROM public; SELECT pg_terminate_backend(pg_stat_activity.pid) diff --git a/Django_Deploy/Service_Deploy_REST_Framework_PostgreSQL.md b/Django_Deploy/Service_Deploy_REST_Framework_PostgreSQL.md index 21bfdfd..8f1fb19 100644 --- a/Django_Deploy/Service_Deploy_REST_Framework_PostgreSQL.md +++ b/Django_Deploy/Service_Deploy_REST_Framework_PostgreSQL.md @@ -1,12 +1,12 @@ -####Installing Django Rest Framework with PostgreSQL on Ubuntu 14.04 +#### Installing Django Rest Framework with PostgreSQL on Ubuntu 14.04 -##Setting Python Version +## Setting Python Version ``` alias python='usr/bin/python3.4' . ~/.bashrc python --version ``` -##Installing PostgreSQL (9.3.11) +## Installing PostgreSQL (9.3.11) ``` sudo apt-get install postgresql sudo apt-get install pgadmin3 @@ -14,7 +14,7 @@ sudo passwd postgres sudo su postgres sudo service postgresql restart ``` -##Setting PostgreSQL +## Setting PostgreSQL ``` vi etc/postgresql/9.3/main/postgresql.conf listen_addresses = '*' @@ -24,7 +24,7 @@ password_encryption = on vi /etc/postgresql/9.3/main/pg_hba.conf host all all 0.0.0.0/0 password ``` -##Installing Django +## Installing Django # djangorestframework 3.3.3 ``` sudo apt-get install python-pip @@ -35,12 +35,12 @@ sudo pip install djangorestframework sudo pip install markdown sudo pip install django-filter ``` -##Installing Apache Server +## Installing Apache Server ``` sudo apt-get install apache2 sudo apt-get install libapache2-mod-wsgi ``` -##Setting Django +## Setting Django ``` cd /var/www @@ -63,7 +63,7 @@ urlpatterns = patterns('', url(r'^$', index), ) ``` -##Setting Apache Sites-available +## Setting Apache Sites-available ``` vi /etc/apache2/sites-available/000-default.conf ``` diff --git a/Django_app.zip b/Django_app.zip new file mode 100644 index 0000000..53f0d5b Binary files /dev/null and b/Django_app.zip differ