Changeset 1590 in main for branches


Ignore:
Timestamp:
08/30/12 13:52:07 (7 years ago)
Author:
pcosquer
Message:

branch 1.1: merge commit [1589] from trunk

Location:
branches/1.1
Files:
9 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/1.1

    • Property svn:mergeinfo changed
      /trunkmerged: 1589
  • branches/1.1/docs/en/admin/ht_1_install_server.rst

    r1588 r1590  
    266266add the following lines: 
    267267     
    268 .. code-block:: apache 
    269  
    270     WSGIScriptAlias / /var/django/openPLM/apache/django.wsgi 
    271     # required to enable webdav access  
    272     WSGIPassAuthorization On  
    273  
    274     Alias /media /var/django/openPLM/media 
    275     <Directory /var/django/openPLM/media> 
    276         Order deny,allow 
    277         Allow from all 
    278     </Directory> 
     268.. literalinclude:: apache/simple_1.1.conf 
     269    :language: apache 
    279270 
    280271Restart Apache server 
     
    371362be enabled) 
    372363 
    373 .. code-block:: apache 
    374  
    375     NameVirtualHost *:80 
    376     <VirtualHost *:80> 
    377  
    378         WSGIScriptAlias / /var/django/openPLM/apache/django.wsgi 
    379         # required to enable webdav access  
    380         WSGIPassAuthorization On  
    381  
    382         <Location "/admin"> 
    383             RewriteEngine On 
    384             RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] 
    385         </Location> 
    386         <Location "/media"> 
    387             RewriteEngine On 
    388             RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] 
    389         </Location> 
    390  
    391     </VirtualHost> 
    392  
    393     NameVirtualHost *:443 
    394     <VirtualHost *:443> 
    395  
    396         SSLEngine on 
    397         SSLCertificateFile    /etc/ssl/mycert.crt 
    398         SSLCertificateKeyFile /etc/ssl/mykey.key 
    399         SSLVerifyClient none 
    400  
    401         WSGIScriptAlias / /var/django/openPLM/apache/django.wsgi 
    402         Alias /media /var/django/openPLM/media 
    403         <Directory /var/django/openPLM/media> 
    404             Order deny,allow 
    405             Allow from all 
    406         </Directory> 
    407  
    408     </VirtualHost> 
     364.. literalinclude:: apache/ssl_1.1.conf 
     365    :language: apache 
    409366 
    410367Configuring E-mails 
  • branches/1.1/docs/en/admin/ht_2_install_server.rst

    r1582 r1590  
    245245add the following lines: 
    246246     
    247 .. code-block:: apache 
    248  
    249     WSGIScriptAlias / /var/django/openPLM/trunk/openPLM/apache/django.wsgi 
    250     # required to enable webdav access  
    251     WSGIPassAuthorization On  
    252  
    253     <Location /media/thumbnails> 
    254         WSGIAccessScript /var/django.openPLM/trunk/openPLM/apache/access_restricted.wsgi 
    255     </Location> 
    256     Alias /media /var/django/openPLM/trunk/openPLM/media 
    257     <Directory /var/django/openPLM/trunk/openPLM/media> 
    258         Order deny,allow 
    259         Allow from all 
    260     </Directory> 
     247.. literalinclude:: apache/simple.conf 
     248    :language: apache 
    261249 
    262250Restart Apache server 
     
    352340be enabled) 
    353341 
    354 .. code-block:: apache 
    355  
    356     NameVirtualHost *:80 
    357     <VirtualHost *:80> 
    358  
    359         WSGIScriptAlias / /var/django/openPLM/trunk/openPLM/apache/django.wsgi 
    360         # required to enable webdav access  
    361         WSGIPassAuthorization On  
    362  
    363         <Location "/admin"> 
    364             RewriteEngine On 
    365             RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] 
    366         </Location> 
    367         <Location "/media"> 
    368             RewriteEngine On 
    369             RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] 
    370         </Location> 
    371  
    372     </VirtualHost> 
    373  
    374     NameVirtualHost *:443 
    375     <VirtualHost *:443> 
    376  
    377         SSLEngine on 
    378         SSLCertificateFile    /etc/ssl/mycert.crt 
    379         SSLCertificateKeyFile /etc/ssl/mykey.key 
    380         SSLVerifyClient none 
    381  
    382         WSGIScriptAlias / /var/django/openPLM/trunk/openPLM/apache/django.wsgi 
    383         <Location /media/thumbnails> 
    384             WSGIAccessScript /var/django.openPLM/trunk/openPLM/apache/access_restricted.wsgi 
    385         </Location> 
    386         Alias /media /var/django/openPLM/trunk/openPLM/media 
    387         <Directory /var/django/openPLM/trunk/openPLM/media> 
    388             Order deny,allow 
    389             Allow from all 
    390         </Directory> 
    391  
    392     </VirtualHost> 
     342.. literalinclude:: apache/ssl.conf 
     343    :language: apache 
    393344 
    394345Configuring E-mails 
  • branches/1.1/docs/en/devel/applications/document3D

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/1.1/docs/fr/Makefile

    r1194 r1590  
    4949        -rm -f user/download/openplm*.oxt 
    5050        cd ../../plugins/openoffice ; \ 
    51         zip -r ../../docs/$()/user/download/openplm-win.oxt pythonpath Addons.xcu META-INF/manifest.xml openplm.py  -x \*.svn* ; \ 
    52         zip -r ../../docs/$()user/download/openplm.oxt Addons.xcu META-INF/manifest.xml openplm.py  -x \*.svn* ; \ 
     51        zip -r ../../docs/fr/user/download/openplm-win.oxt pythonpath Addons.xcu META-INF/manifest.xml openplm.py  -x \*.svn* ; \ 
     52        zip -r ../../docs/fr/user/download/openplm.oxt Addons.xcu META-INF/manifest.xml openplm.py  -x \*.svn* ; \ 
    5353        cd ../../docs 
    5454 
  • branches/1.1/docs/fr/admin/ht_1_install_server.rst

    r1588 r1590  
    279279Éditer le fichier de configuration d'Apache (:file:`/etc/apache2/httpd.conf`) et ajouter les lignes suivantes : 
    280280     
    281 .. code-block:: apache 
    282  
    283     WSGIScriptAlias / /var/django/openPLM/apache/django.wsgi 
    284     Alias /media /var/django/openPLM/media 
    285     <Directory /var/django/openPLM/media> 
    286         Order deny,allow 
    287         Allow from all 
    288     </Directory> 
     281.. literalinclude:: apache/simple_1.1.conf 
     282    :language: apache 
     283 
    289284 
    290285Redémarrage du serveur Apache 
     
    385380Une configuration possible de apache (avec les modules rewrite et ssl activés) : 
    386381 
    387 .. code-block:: apache 
    388  
    389     NameVirtualHost *:80 
    390     <VirtualHost *:80> 
    391  
    392         WSGIScriptAlias / /var/django/openPLM/apache/django.wsgi 
    393         <Location "/admin"> 
    394             RewriteEngine On 
    395             RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] 
    396         </Location> 
    397         <Location "/media"> 
    398             RewriteEngine On 
    399             RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] 
    400         </Location> 
    401  
    402     </VirtualHost> 
    403  
    404     NameVirtualHost *:443 
    405     <VirtualHost *:443> 
    406  
    407         SSLEngine on 
    408         SSLCertificateFile    /etc/ssl/mycert.crt 
    409         SSLCertificateKeyFile /etc/ssl/mykey.key 
    410         SSLVerifyClient none 
    411  
    412         WSGIScriptAlias / /var/django/openPLM/apache/django.wsgi 
    413         Alias /media /var/django/openPLM/media 
    414         <Directory /var/django/openPLM/media> 
    415             Order deny,allow 
    416             Allow from all 
    417         </Directory> 
    418  
    419     </VirtualHost> 
     382.. literalinclude:: apache/ssl_1.1.conf 
     383    :language: apache 
     384 
    420385 
    421386Configuration des Emails 
  • branches/1.1/docs/fr/admin/ht_2_install_server.rst

    r1582 r1590  
    256256Éditer le fichier de configuration d'Apache (:file:`/etc/apache2/httpd.conf`) et ajouter les lignes suivantes : 
    257257     
    258 .. code-block:: apache 
    259  
    260     WSGIScriptAlias / /var/django/openPLM/trunk/openPLM/apache/django.wsgi 
    261     Alias /media /var/django/openPLM/trunk/openPLM/media 
    262     <Directory /var/django/openPLM/trunk/openPLM/media> 
    263         Order deny,allow 
    264         Allow from all 
    265     </Directory> 
     258.. literalinclude:: apache/simple.conf 
     259    :language: apache 
     260 
    266261 
    267262Redémarrage du serveur Apache 
     
    362357Une configuration possible de apache (avec les modules rewrite et ssl activés) : 
    363358 
    364 .. code-block:: apache 
    365  
    366     NameVirtualHost *:80 
    367     <VirtualHost *:80> 
    368  
    369         WSGIScriptAlias / /var/django/openPLM/trunk/openPLM/apache/django.wsgi 
    370         <Location "/admin"> 
    371             RewriteEngine On 
    372             RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] 
    373         </Location> 
    374         <Location "/media"> 
    375             RewriteEngine On 
    376             RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] 
    377         </Location> 
    378  
    379     </VirtualHost> 
    380  
    381     NameVirtualHost *:443 
    382     <VirtualHost *:443> 
    383  
    384         SSLEngine on 
    385         SSLCertificateFile    /etc/ssl/mycert.crt 
    386         SSLCertificateKeyFile /etc/ssl/mykey.key 
    387         SSLVerifyClient none 
    388  
    389         WSGIScriptAlias / /var/django/openPLM/trunk/openPLM/apache/django.wsgi 
    390         Alias /media /var/django/openPLM/trunk/openPLM/media 
    391         <Directory /var/django/openPLM/trunk/openPLM/media> 
    392             Order deny,allow 
    393             Allow from all 
    394         </Directory> 
    395  
    396     </VirtualHost> 
     359.. literalinclude:: apache/ssl.conf 
     360    :language: apache 
     361 
    397362 
    398363Configuration des Emails 
  • branches/1.1/docs/skel/Makefile

    r1194 r1590  
    4949        -rm -f user/download/openplm*.oxt 
    5050        cd ../../plugins/openoffice ; \ 
    51         zip -r ../../docs/$()/user/download/openplm-win.oxt pythonpath Addons.xcu META-INF/manifest.xml openplm.py  -x \*.svn* ; \ 
    52         zip -r ../../docs/$()user/download/openplm.oxt Addons.xcu META-INF/manifest.xml openplm.py  -x \*.svn* ; \ 
     51        zip -r ../../docs/$(LANGUAGE)/user/download/openplm-win.oxt pythonpath Addons.xcu META-INF/manifest.xml openplm.py  -x \*.svn* ; \ 
     52        zip -r ../../docs/$(LANGUAGE)/user/download/openplm.oxt Addons.xcu META-INF/manifest.xml openplm.py  -x \*.svn* ; \ 
    5353        cd ../../docs 
    5454 
  • branches/1.1/openPLM

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.