Skip to content

M
mcotton-v1
Commit a621080f by Hao Chen
Options

remove meteor reset in start.sh

parent 314c521e
Showing with 95 additions and 61 deletions
.idea/workspace.xml
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2e5af44c-1b55-4cba-bd4e-692506760c8b" name="Default" comment=""> <list default="true" id="2e5af44c-1b55-4cba-bd4e-692506760c8b" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/lib/collections/0_fsstore.js" afterPath="$PROJECT_DIR$/app/lib/collections/0_fsstore.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/start_mcotton.sh" afterPath="$PROJECT_DIR$/start_mcotton.sh" />
</list> </list>
<ignored path="mcotton-v1.iws" /> <ignored path="mcotton-v1.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -22,26 +23,6 @@ ...@@ -22,26 +23,6 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="108" lean-forward="true" selection-start-line="17" selection-start-column="108" selection-end-line="17" selection-end-column="108" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="home.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/client/templates/home/home.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="home.js" pinned="false" current-in-tab="false"> <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/client/templates/home/home.js"> <entry file="file://$PROJECT_DIR$/app/client/templates/home/home.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -75,42 +56,69 @@ ...@@ -75,42 +56,69 @@
<file leaf-file-name="config.js" pinned="false" current-in-tab="false"> <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/server/config.js"> <entry file="file://$PROJECT_DIR$/app/server/config.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75"> <state relative-caret-position="135">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="9" column="21" lean-forward="true" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="start_mcotton.sh" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/start_mcotton.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="2" lean-forward="false" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="0_fsstore.js" pinned="false" current-in-tab="true"> <file leaf-file-name="0_fsstore.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/lib/collections/0_fsstore.js"> <entry file="file://$PROJECT_DIR$/app/lib/collections/0_fsstore.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-18"> <state relative-caret-position="252">
<caret line="59" column="39" lean-forward="true" selection-start-line="59" selection-start-column="39" selection-end-line="59" selection-end-column="39" /> <caret line="68" column="16" lean-forward="true" selection-start-line="68" selection-start-column="16" selection-end-line="68" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="start_mcotton.sh" pinned="false" current-in-tab="false"> <file leaf-file-name="datatriggers.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/start_mcotton.sh"> <entry file="file://$PROJECT_DIR$/app/server/datatriggers.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="315">
<caret line="3" column="78" lean-forward="false" selection-start-line="3" selection-start-column="78" selection-end-line="3" selection-end-column="78" /> <caret line="21" column="29" lean-forward="true" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="README.md" pinned="false" current-in-tab="false"> <file leaf-file-name="0_globalconst.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md"> <entry file="file://$PROJECT_DIR$/app/lib/collections/0_globalconst.js">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="text-editor">
<state split_layout="SPLIT"> <state relative-caret-position="911">
<first_editor relative-caret-position="256"> <caret line="130" column="95" lean-forward="false" selection-start-line="130" selection-start-column="95" selection-end-line="130" selection-end-column="95" />
<caret line="113" column="0" lean-forward="true" selection-start-line="113" selection-start-column="0" selection-end-line="113" selection-end-column="0" /> <folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="1_fsCollections.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/lib/collections/1_fsCollections.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-255">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="2_modules.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/lib/collections/2_modules.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</first_editor>
<second_editor />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -146,10 +154,10 @@ ...@@ -146,10 +154,10 @@
<option value="$PROJECT_DIR$/app/client/templates/home/home.js" /> <option value="$PROJECT_DIR$/app/client/templates/home/home.js" />
<option value="$PROJECT_DIR$/.env" /> <option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/README.md" /> <option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/start_mcotton.sh" />
<option value="$PROJECT_DIR$/Dockerfile" /> <option value="$PROJECT_DIR$/Dockerfile" />
<option value="$PROJECT_DIR$/app/client/templates/includes/footer.html" /> <option value="$PROJECT_DIR$/app/client/templates/includes/footer.html" />
<option value="$PROJECT_DIR$/app/lib/collections/0_fsstore.js" /> <option value="$PROJECT_DIR$/app/lib/collections/0_fsstore.js" />
<option value="$PROJECT_DIR$/start_mcotton.sh" />
</list> </list>
</option> </option>
</component> </component>
...@@ -384,12 +392,12 @@ ...@@ -384,12 +392,12 @@
<updated>1470845079618</updated> <updated>1470845079618</updated>
<workItem from="1481118331939" duration="4176000" /> <workItem from="1481118331939" duration="4176000" />
<workItem from="1481163956581" duration="23000" /> <workItem from="1481163956581" duration="23000" />
<workItem from="1481164370400" duration="8080000" /> <workItem from="1481164370400" duration="8506000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="12279000" /> <option name="totallyTimeSpent" value="12705000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="54" y="23" width="1276" height="777" extended-state="0" /> <frame x="54" y="23" width="1276" height="777" extended-state="0" />
...@@ -481,13 +489,6 @@ ...@@ -481,13 +489,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/lib/collections/0_globalconst.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="130" column="95" lean-forward="false" selection-start-line="130" selection-start-column="95" selection-end-line="130" selection-end-column="95" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.meteor/release"> <entry file="file://$PROJECT_DIR$/.meteor/release">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="15">
...@@ -515,14 +516,6 @@ ...@@ -515,14 +516,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/start_mcotton.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="78" lean-forward="false" selection-start-line="3" selection-start-column="78" selection-end-line="3" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Dockerfile"> <entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="255">
...@@ -563,9 +556,25 @@ ...@@ -563,9 +556,25 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/server/config.js"> <entry file="file://$PROJECT_DIR$/app/lib/collections/0_globalconst.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="911">
<caret line="130" column="95" lean-forward="false" selection-start-line="130" selection-start-column="95" selection-end-line="130" selection-end-column="95" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/lib/collections/1_fsCollections.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75"> <state relative-caret-position="-255">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/lib/collections/2_modules.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
...@@ -573,8 +582,32 @@ ...@@ -573,8 +582,32 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/lib/collections/0_fsstore.js"> <entry file="file://$PROJECT_DIR$/app/lib/collections/0_fsstore.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-18"> <state relative-caret-position="252">
<caret line="59" column="39" lean-forward="true" selection-start-line="59" selection-start-column="39" selection-end-line="59" selection-end-column="39" /> <caret line="68" column="16" lean-forward="true" selection-start-line="68" selection-start-column="16" selection-end-line="68" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/server/datatriggers.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="21" column="29" lean-forward="true" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/server/config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="21" lean-forward="true" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/start_mcotton.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="2" lean-forward="false" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
start_mcotton.sh
#!/bin/bash #!/bin/bash
MONGO_URL=mongodb://mongodb/mcotton_v1 mqttDbUrl=mongodb://mongodb/mqtt meteor reset --allow-superuser # MONGO_URL=mongodb://mongodb/mcotton_v1 mqttDbUrl=mongodb://mongodb/mqtt meteor reset --allow-superuser
MONGO_URL=mongodb://mongodb/mcotton_v1 mqttDbUrl=mongodb://mongodb/mqtt meteor --allow-superuser --release 1.4.2.3 MONGO_URL=mongodb://mongodb/mcotton_v1 mqttDbUrl=mongodb://mongodb/mqtt meteor --allow-superuser --release 1.4.2.3
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment