diff --git a/frontend/frontend/locale/ru/LC_MESSAGES/django.mo b/frontend/frontend/locale/ru/LC_MESSAGES/django.mo index 1071481..f1131b5 100644 Binary files a/frontend/frontend/locale/ru/LC_MESSAGES/django.mo and b/frontend/frontend/locale/ru/LC_MESSAGES/django.mo differ diff --git a/frontend/frontend/locale/ru/LC_MESSAGES/django.po b/frontend/frontend/locale/ru/LC_MESSAGES/django.po index 3b5aeb5..04e9ac0 100644 --- a/frontend/frontend/locale/ru/LC_MESSAGES/django.po +++ b/frontend/frontend/locale/ru/LC_MESSAGES/django.po @@ -37,7 +37,7 @@ msgstr "Лента готова!" #: templates/frontend/preview.html:19 msgid "subscribe.your_feed" -msgstr "Ваша лента:" +msgstr "Ваша лента" #: templates/frontend/preview.html:26 msgid "subscribe.loading" diff --git a/frontend/frontend/settings.py.example b/frontend/frontend/settings.py.example index 8c89623..bf481a0 100644 --- a/frontend/frontend/settings.py.example +++ b/frontend/frontend/settings.py.example @@ -162,5 +162,5 @@ PIPELINE_JS = { } } -DOWNLOADER_PAGE_URL = 'http://politepol.com/downloader?url=' -FEED_PAGE_URL = 'http://politepol.com/feed/' +DOWNLOADER_PAGE_URL = '/downloader?url=' +FEED_PAGE_URL = '/feed/' diff --git a/frontend/frontend/templates/frontend/preview.html b/frontend/frontend/templates/frontend/preview.html index 264ca38..a4c1a24 100644 --- a/frontend/frontend/templates/frontend/preview.html +++ b/frontend/frontend/templates/frontend/preview.html @@ -18,7 +18,7 @@

{% trans 'subscribe.your_feed' %}:

- {{ feed_url }} + {% if request.is_secure %}http{% else %}https{% endif %}://{{ request.get_host }}{{ feed_url }}

diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..3b865f4 --- /dev/null +++ b/readme.md @@ -0,0 +1,72 @@ +== Installation of development server + +Install required packages + +sudo apt-get install python-minimal libmysqlclient-dev libxml2-dev libxslt-dev python-dev libffi-dev gcc libssl-dev gettext + +Install pip +``` +pushd /tmp +wget https://bootstrap.pypa.io/get-pip.py +sudo python get-pip.py +popd +``` + +Install pip packages +``` +sudo pip install -r requirements.txt +``` + +Install less +``` +sudo apt-get install nodejs npm +sudo npm install -g less +sudo ln -s /usr/bin/nodejs /usr/bin/node +``` + +Install sass +``` +sudo apt-get install ruby +sudo su -c "gem install sass" +``` + +Install and setup nginx +``` +sudo apt-get install nginx +sudo cp pol/nginx/default.site-example /etc/nginx/sites-available/default +sudo service nginx reload +``` + +Install and setup mysql. **Use password 'toor' for root user** +``` +sudo apt-get install mysql-server +mysql -uroot -ptoor -e 'CREATE DATABASE pol DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;' +``` + +Initialise database +``` +pushd pol/frontend +python manage.py migrate +python manage.py loaddata fields.json +popd + +Create django config +``` +cp pol/frontend/frontend/settings.py.example pol/frontend/frontend/settings.py +``` + +== Run servers + +Run downloader server +``` +pushd pol +python downloader.py +popd +``` + +Run frontend server +``` +pushd pol/frontend +python manage.py runserver +popd +``` diff --git a/requirements.txt b/requirements.txt index 90d7055..48e7599 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -#sudo apt-get install libmysqlclient-dev libxml2-dev libxslt-dev python-dev libffi-dev gcc libssl-dev gettext_ +#sudo apt-get install libmysqlclient-dev libxml2-dev libxslt-dev python-dev libffi-dev gcc libssl-dev gettext Django==1.8.6 lxml==3.3.3 Scrapy==1.0.3