Merge branch 'master' into 'develop'

Master

Änderungen an der .gitlab-ci.yaml mussten direkt am Master-Branch durchgeführt werden.
Diese Änderungen sind nun fertig weshalb wir diese in den Develop Branch übernehmen.

Master Branch ist absofort "Protected"

See merge request !3

.gitignore

 /vendor
 /node_modules
 /public/storage
-Homestead.yaml
 Homestead.json
 .env

.gitlab-ci.yml

 update:
+  only:
+    - tags
+    - triggers
   before_script:
     # Abhängigkeiten überprüfen
     - which virtualbox
@@ -6,20 +9,10 @@ update:
     - which composer
     - which git
     - which php
+  script:
     # Pfad zum neu geklonten Repo
     - path=`pwd`
-    # Klone das Repo neu, falls es noch nicht existiert
-    - if [ ! -d ~/MetaGer ] ; then git clone "$path" ; fi
-    # Falls notwendig Laravel-Framework initialisieren:
-    - cd ~/MetaGer
-    - composer update
-    - tmp=$(chmod -R 777 storage/ bootstrap/cache)
-    - if [ ! -f .env ] ; then cp .env.example .env ; fi
-    - if [ $(grep "SomeRandomString" .env) ] ; then php artisan key:generate ; fi
-    # Falls notwendig Homestead Server intialisieren:
     - cd ~/
-  script:
+    - $path/deploy/checkServerStatus.sh "$path"
     - cd ~/MetaGer
-    - git pull "$path"
-  only:
-    - master@gitlab.metager3.de:1234/
\ No newline at end of file
+    - git pull "$path"
\ No newline at end of file

deploy/Homestead.yaml

+---
+ip: "192.168.10.10"
+memory: 2048
+cpus: 1
+provider: virtualbox
+
+authorize: ~/.ssh/id_rsa.pub
+
+keys:
+    - ~/.ssh/id_rsa
+
+folders:
+    - map: ~/MetaGer
+      to: /home/vagrant/MetaGer
+
+sites:
+    - map: 192.168.10.10
+      to: /home/vagrant/MetaGer/public
+
+databases:
+    - homestead
+
+# blackfire:
+#     - id: foo
+#       token: bar
+#       client-id: foo
+#       client-token: bar
+
+# ports:
+#     - send: 50000
+#       to: 5000
+#     - send: 7777
+#       to: 777
+#       protocol: udp

deploy/checkServerStatus.sh

+path="$1"
+# Klone das Repo neu, falls es noch nicht existiert
+if [ ! -d ~/MetaGer ]
+then 
+	cd ~/
+	git clone "$path" 
+	cd ~/MetaGer
+	composer update 
+	chmod -R 777 storage/ bootstrap/cache
+fi
+# Falls notwendig Laravel-Framework initialisieren:
+
+if [ ! -f ~/MetaGer/.env ]
+then 
+	cd ~/MetaGer
+	cp .env.example .env
+fi
+if [ $(grep "SomeRandomString" ~/MetaGer/.env) ]
+then 
+	cd ~/MetaGer
+	php artisan key:generate
+fi
+# Falls notwendig Homestead Server intialisieren:
+if [ ! -d ~/Homestead ]
+then
+	cd ~/
+	# Wir brauchen unseren öffentlichen ssh Schlüssel:
+	if [ ! -d .ssh ]
+	then
+		mkdir .ssh
+		chmod 700 .ssh
+	fi
+	if [ ! -f .ssh/id_rsa.pub ]
+	then
+		cd .ssh
+		ssh-keygen -t rsa -N "" -f id_rsa
+		cd ~/
+	fi
+	vagrant box add --provider virtualbox laravel/homestead
+	git clone https://github.com/laravel/homestead.git Homestead
+	cd Homestead/
+	bash init.sh
+	cd ~/
+	cp -f "$path/deploy/Homestead.yaml" .homestead/
+	cd Homestead/
+	vagrant up
+	echo "Your server is now running under http://localhost:8000"
+fi