Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: 20/Mocambos_Portal_Local
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: RedeMocambos/Mocambos_Portal_Local
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Aug 9, 2012

  1. Copy the full SHA
    9eb96e1 View commit details
Showing with 31 additions and 8 deletions.
  1. +4 −3 INSTALL
  2. +15 −5 exemplos/settings.py
  3. +9 −0 exemplos/urls.py
  4. +1 −0 script/install-django-env.sh
  5. +2 −0 script/requirements.txt
7 changes: 4 additions & 3 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -11,14 +11,15 @@ Depois de ter ja criado e ativado o ambiente com virtualenv, crie uma aplicaçã
python django-admin.py startproject NomeDoPortalLocal

Copie e altere os arquivos "settings.py" e "urls.py" que encontra na pasta "Mocambos_Portal_Local/exemplos/" para
a raiz da pasta que criou "NomeDoPortalLocal".
a raiz da pasta que criou "NomeDoPortalLocal".

Tem que verificar que todos os links estao certos.

Agora precisa instalar os aplicativos especificos para entrar na rede de portais locais e compartilhar arquivos.
Vamos instalar o "mmedia" e o "gitannex". Entre na pasta "~/VirtualEnvs/Mocambos_Portal/lib/python2.6/site-packages" e digite:
git clone https://20@github.com/20/mmedia.git
git clone https://20@github.com/20/gitannex.git
git clone https://github.com/RedeMocambos/mmedia.git
git clone https://github.com/RedeMocambos/gitannex.git
git clone https://github.com/RedeMocambos/baobaxia.git

Agora podem entrar na pasta do portal "NomeDoPortalLocal" e:
criar a estrutura de pasta para os medias:
20 changes: 15 additions & 5 deletions exemplos/settings.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Django settings for Mocambos_Portal project.
BASE_ROOT = '/home/taina/CasaDeCulturaTaina/'
ROOT_URLCONF = 'CasaDeCulturaTaina.urls'
BASE_ROOT = '/home/mocambos/portal_taina/'
ROOT_URLCONF = 'portal_taina.urls'
GITANNEX_DIR = 'gitannex'
SERIALIZED_DIR = 'serialized'
PORTAL_NAME = 'taina.mocambos.net'
@@ -87,7 +87,7 @@
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
'/home/taina/CasaDeCulturaTaina/static/sta',
'/home/mocambos/portal_taina/static/sta',
)

# List of finder classes that know how to find static files in
@@ -124,6 +124,7 @@
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.

)

INSTALLED_APPS = (
@@ -141,10 +142,13 @@
# 'filer',
# 'grappelli',
# 'filebrowser',
"registration_defaults",
'django.contrib.admin',
# 'django_bfm',
'mmedia',
'gitannex',
'baobaxia',
'registration',
# 'debug_toolbar',
)

@@ -201,8 +205,7 @@
#

import ldap
from django_auth_ldap.config import LDAPSearch, GroupOfNamesType

from django_auth_ldap.config import LDAPSearch, GroupOfNamesType, PosixGroupType

# Baseline configuration.
AUTH_LDAP_SERVER_URI = "ldap://localhost"
@@ -219,6 +222,7 @@
)
#AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn")
AUTH_LDAP_GROUP_TYPE = GroupOfNamesType()
#AUTH_LDAP_GROUP_TYPE = PosixGroupType()

# # Only users in this group can log in.
# #AUTH_LDAP_REQUIRE_GROUP = "cn=enabled,ou=django,ou=groups,dc=example,dc=com"
@@ -266,3 +270,9 @@
)

#FILER_STATICMEDIA_PREFIX = '/media/filer/'

import logging

logger = logging.getLogger('django_auth_ldap')
logger.addHandler(logging.StreamHandler())
logger.setLevel(logging.DEBUG)
9 changes: 9 additions & 0 deletions exemplos/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.conf.urls.defaults import patterns, include, url
from django.contrib.auth.views import login, logout
from django.conf import settings
# For Django-Filer
#from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -10,6 +11,7 @@
from django.contrib import admin
admin.autodiscover()


urlpatterns = patterns('',
# Examples:
# url(r'^$', 'Mocambos_Portal.views.home', name='home'),
@@ -19,7 +21,14 @@
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),

# Uncomment the next line to enable the admin:
(r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name' : 'registration/password_reset.html', 'post_reset_redirect': '/logout/' }),
url(r'^admin/', include(admin.site.urls)),
url(r'^$', 'baobaxia.views.index', name='index'),
url(r'^publica', 'baobaxia.views.publica', name='index'),
url(r'^accounts/', include('registration.backends.default.urls')),
# (r'^accounts/login/$', login, include('registration.backends.default.urls')),
# (r'^accounts/logout/$', logout, include('registration.backends.default.urls')),

# # For Django-Grappelli
# url(r'^grappelli/', include('grappelli.urls')),
## For Django-Filebrowser 3.4.0
1 change: 1 addition & 0 deletions script/install-django-env.sh
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ pip install django==1.3.1
pip install django-auth-ldap
pip install python-ldap
pip install pillow
pip install -e requirements.txt

# # Pacotes necessarios para django-filer
# sudo apt-get install libfreetype6-dev liblcms1-dev libjpeg8-dev
2 changes: 2 additions & 0 deletions script/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
django-registration
-e git://github.com/yourcelf/django-registration-defaults.git#egg=django-registration-defaults