Minor fixes for Namecheap updates

GhostManager · Oct 2, 2019 · ce10673 · ce10673
1 parent d333e97
commit ce10673
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 27 deletions.
diff --git a/.envs_template/.production/.django b/.envs_template/.production/.django
@@ -30,12 +30,10 @@ COMPRESS_ENABLED=
 # ------------------------------------------------------------------------------
 WEB_CONCURRENCY=4
 
-
 # Redis
 # ------------------------------------------------------------------------------
 REDIS_URL=redis://redis:6379/0
 
-
 # QCluster
 # ------------------------------------------------------------------------------
 QCLUSTER_NAME=soar
@@ -58,4 +56,13 @@ SLACK_URL=https://hooks.slack.com/services/<your_webhook_url>
 # ------------------------------------------------------------------------------
 COMPANY_NAME=Ghostwriter
 COMPANY_TWITTER=@ghostwriter
-COMPANY_EMAIL=info@ghostwriter.local
+COMPANY_EMAIL=info@ghostwriter.local
+
+# Namecheap
+# ------------------------------------------------------------------------------
+NAMECHEAP_ENABLE=False
+NAMECHEAP_API_KEY=
+NAMECHEAP_USERNAME=
+NAMECHEAP_API_USERNAME=
+CLIENT_IP=
+NAMECHEAP_PAGE_SIZE=100
diff --git a/ghostwriter/shepherd/templates/shepherd/update.html b/ghostwriter/shepherd/templates/shepherd/update.html
@@ -21,33 +21,33 @@
     <h2>Domain Update Control Panel</h2>
 
     <!-- Domain Library Update Section -->
-    <h6><i class="fas fa-cloud-download-alt"></i> Pull Domains from Namecheap</h6>
+    {% if enable_namecheap %}
-    <hr>
+        <h6><i class="fas fa-cloud-download-alt"></i> Pull Domains from Namecheap</h6>
-
+        <hr>
-    <p>The domain library sync with Mamecheap was last requested on:</p>
+
-    <p style="font-size: 20px; padding: 10 10 10 10">
+        <p>The domain library sync with Namecheap was last requested on:</p>
-        <strong>{{ namecheap_last_update_requested }}</strong>
+        <p style="font-size: 20px; padding: 10 10 10 10">
-    </p>
+            <strong>{{ namecheap_last_update_requested }}</strong>
-
+        </p>
-    {% if namecheap_last_update_completed %}
+
-        {% if namecheap_last_update_completed == 'Failed' %}
+        {% if namecheap_last_update_completed %}
-            <p>Request Status: <span class="badge badge-pill badge-danger">{{ namecheap_last_update_completed }}</span></p>
+            {% if namecheap_last_update_completed == 'Failed' %}
-            {% if cat_last_result %}
+                <p>Request Status: <span class="badge badge-pill badge-danger">{{ namecheap_last_update_completed }}</span></p>
-                <div style="border: 1px solid black;width: 50%; margin: 0 auto; border-radius: 5px; background-color: #f1f1f1">
+                {% if cat_last_result %}
-                    <strong>Error: </strong>
+                    <div style="border: 1px solid black;width: 50%; margin: 0 auto; border-radius: 5px; background-color: #f1f1f1">
-                    <em style="color: red">
+                        <strong>Error: </strong>
-                        {{ namecheap_last_result }}
+                        <em style="color: red">
-                    </em>
+                            {{ namecheap_last_result }}
-                </div>
+                        </em>
-            {% endif %}
+                    </div>
-        {% else %}
+                {% endif %}
-            {% if namecheap_last_update_completed %}
+            {% else %}
-                <p>Request Status: <span class="badge badge-pill badge-success">Completed on {{ namecheap_last_update_completed }} in {{ namecheap_last_update_time }} minutes</span></p>
+                {% if namecheap_last_update_completed %}
+                    <p>Request Status: <span class="badge badge-pill badge-success">Completed on {{ namecheap_last_update_completed }} in {{ namecheap_last_update_time }} minutes</span></p>
+                {% endif %}
             {% endif %}
         {% endif %}
-    {% endif %}
 
-    {% if enable_namecheap %}
         <form action="{% url 'shepherd:update_namecheap' %}" method="POST">
             {% csrf_token %}
             <input type="hidden" id="user_id" name="user_id" value='{{ user.get_username }}'>