Browse Source

modified install scripts

david.berlinskiy 11 tháng trước cách đây
mục cha
commit
b19467e370
4 tập tin đã thay đổi với 7 bổ sung5 xóa
  1. 1 1
      bin/install.cfg
  2. 1 1
      bin/install.sh
  3. 2 0
      core/settings.py
  4. 3 3
      core/urls.py

+ 1 - 1
bin/install.cfg

@@ -3,5 +3,5 @@ BACKEND="https://git.sharix-app.org/ShariX_Open/sharix-open-backend.git"
 CONFIG="https://git.sharix-app.org/ShariX_Open/sharix-open-config.git"
 DESIGN_TEMPLATE="https://git.sharix-app.org/ShariX_Open/sharix-open-webapp-design-template.git"
 WEBSERVICE_RUNNING="https://git.sharix-app.org/ShariX_Open/sharix-open-webservice-running.git"
-LANDING="https://git.sharix-app.org/ShariX_Open/sharix-open-landing.git"
+LANDING="https://git.sharix-app.org/ShariX_Assist/sharix-assist-landing.git"
 USER_MODEL="https://git.sharix-app.org/ShariX_Open/sharix-open-user-model.git"

+ 1 - 1
bin/install.sh

@@ -27,7 +27,7 @@ update_repository "$BACKEND" "dbsynce" "metasynced_module"
 update_repository "$CONFIG" "conf" "master"
 update_repository "$DESIGN_TEMPLATE" "design_template" "unstable"
 update_repository "$WEBSERVICE_RUNNING" "webservice_running" "unstable"
-update_repository "$LANDING" "landing" "new_version"
+update_repository "$LANDING" "landing" "new-version"
 update_repository "$USER_MODEL" "user" "master"
 update_repository "$WEBAPP_BASE" "design_template" "unstable"
 git pull

+ 2 - 0
core/settings.py

@@ -54,6 +54,8 @@ INSTALLED_APPS = [
     'debug_toolbar',
     'ckeditor',
     'landing.apps.LandingConfig',
+    'captcha'
+    
 ]
 
 MIDDLEWARE = [

+ 3 - 3
core/urls.py

@@ -6,15 +6,15 @@ from django.conf.urls.i18n import i18n_patterns
 
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
+    path('testwords/admin/', admin.site.urls),
 ] + i18n_patterns(
         path('i18n/', include('django.conf.urls.i18n')),
-        path('', include('SharixAdmin.urls')),
+        path('', include("landing.urls")),
         path('tickets/', include('tickets.urls', namespace='tickets'), name='tickets'),
         path('design/', include("design_template.urls"), name='design'),
         path('dbsynce/', include("dbsynce.urls"), name="dbsynce"),
         path('webservice/', include("webservice_running.urls"), name='webservice_running'),
-        path('landing/', include("landing.urls"), name="landing"),
+        path('my/', include('SharixAdmin.urls'), name="Admin"),
         prefix_default_language=False,
     )