Mercurial Mercurial > annotation-dashboard / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct deploy scripts and deploy tests
authorymh <ymh.work@gmail.com>
Mon, 17 Sep 2018 10:47:06 +0200
changeset 5 b26c9c44dd84
parent 4 df751568fda6
child 6 819a7ab4e3fb
correct deploy scripts and deploy tests
clientjs/packages/dashboard-components/src/ui/index.js file | annotate | diff | comparison | revisions
deploy/Vagrantfile file | annotate | diff | comparison | revisions
deploy/test_playbook.yml file | annotate | diff | comparison | revisions 
--- a/clientjs/packages/dashboard-components/src/ui/index.js	Mon Sep 17 01:35:46 2018 +0200
+++ b/clientjs/packages/dashboard-components/src/ui/index.js	Mon Sep 17 10:47:06 2018 +0200
@@ -9,6 +9,7 @@
   faFileAlt,
   faShareAlt,
   faGlobe,
+  faCircleNotch,
 } from '@fortawesome/free-solid-svg-icons';
 
 import { faWikipediaW } from '@fortawesome/free-brands-svg-icons';
@@ -23,6 +24,7 @@
   faShareAlt,
   faGlobe,
   faWikipediaW,
+  faCircleNotch,
 );
 
 export { default as Annotation } from './Annotation';
--- a/deploy/Vagrantfile	Mon Sep 17 01:35:46 2018 +0200
+++ b/deploy/Vagrantfile	Mon Sep 17 10:47:06 2018 +0200
@@ -2,9 +2,10 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "maier/alpine-3.6-x86_64"
+#  config.vm.box = "maier/alpine-3.6-x86_64"
+  config.vm.box = "generic/alpine38"
 
-  config.vm.network "private_network", ip: "172.16.1.7"
+  config.vm.network "private_network", ip: "172.16.1.7", auto_config: false
   config.vbguest.auto_update = false
 
   # config.vm.provider :virtualbox do |vb|
--- a/deploy/test_playbook.yml	Mon Sep 17 01:35:46 2018 +0200
+++ b/deploy/test_playbook.yml	Mon Sep 17 10:47:06 2018 +0200
@@ -5,9 +5,23 @@
 - hosts: all
   become: true
   tasks:
+    - name: set eth1 interface
+      blockinfile:
+        path: /etc/network/interfaces
+        block: |
+          auto eth1
+          iface eth1 inet static
+              address 172.16.1.7
+              netmask 255.255.255.0
+      register: eth1_added
+    - name: restart network service
+      service:
+        name: networking
+        state: restarted
+      when: eth1_added.changed
     - name: install deps
       apk:
-        name: python-dev,python3-dev,py-virtualenv,nginx,supervisor,shadow,build-base,musl-dev,gcc,linux-headers,libffi,libffi-dev
+        name: python-dev,python3-dev,py-virtualenv,nginx,supervisor,build-base,musl-dev,gcc,linux-headers,libffi,libffi-dev, shadow@community
         update_cache: yes
     - name: create etc supervisor.d folder
       file:
@@ -17,3 +31,8 @@
       service:
         name: supervisord
         state: started
+    - name: Set authorized key for user vagrant copying it from current user
+      authorized_key:
+        user: vagrant
+        state: present
+        key: "{{ lookup('file', lookup('env','HOME') + '/.ssh/id_rsa.pub') }}"
\ No newline at end of file
annotation-dashboard