Merge pull request #36 from andreapollastri/develop

Autoinstallation Laravel & Wordpress

resources/views/applications.blade.php

@@ -75,21 +75,28 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="autoinstall" class="col-md-4 col-form-label text-md-right">{{ __('Autoinstall') }}<br><span style="color:red"><b>(beta feature)</b></span></label>
+                        <label for="autoinstall" class="col-md-4 col-form-label text-md-right">{{ __('Autoinstall') }}</label>
                         <div class="col-md-6">
                             <select class="form-control" name="autoinstall">
                                 <option value="none">{{ __('None... just pure web!') }}</option>
-                                <option value="git">{{ __('Init a GIT project') }}</option>
                                 <option value="laravel">{{ __('Install Laravel') }}</option>
                                 <option value="wordpress">{{ __('Install Wordpress') }}</option>
+                                <option value="git">{{ __('Init a GIT project (coming soon)') }}</option>
                             </select>
                         </div>
                     </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ __('Close') }}</button>
-                    <button type="submit" class="btn btn-primary">{{ __('Create application') }}</button>
+                    <button type="submit" class="btn btn-primary" id="app-create">{{ __('Create application') }}</button>
+                    <button type="button" class="btn btn-danger" id="app-coming" style="display: none;">{{ __('Application is coming... Hold On!') }}</button>
                 </div>
+                <script>
+                    $("#app-create").click(function() {
+                        $(this).hide();
+                        $("#app-coming").show();
+                    });
+                </script>
             </form>
         </div>
     </div>

resources/views/layouts/app.blade.php

@@ -146,4 +146,4 @@
     @yield('scripts')
 </body>
 
-</html>
+</html>

storage/app/scripts/hostadd.sh

@@ -46,9 +46,6 @@ while [ -n "$1" ] ; do
             shift
 done
 
-DBNAME=$USER_NAME
-DBUSER=$USER_NAME
-
 #AUTOINSTALL BASE_PATH MOD
 if [ "$AUTO_INSTALL" = "laravel" ]; then
     BASE_PATH="public"
@@ -79,8 +76,6 @@ chown -R $USER_NAME:$USER_NAME /home/$USER_NAME
 CONF=/etc/apache2/sites-available/$USER_NAME.conf
 touch $CONF
 
-
-
 mkdir /home/$USER_NAME/web/$BASE_PATH
 cat > "$CONF" <<EOF
 <VirtualHost *:80>
@@ -290,12 +285,14 @@ sudo cat > "$BASE" <<EOF
 </html>
 EOF
 
-#PERMISSIONS
-chown -R $USER_NAME:$USER_NAME /home/$USER_NAME/web/
-chown -R $USER_NAME:$USER_NAME /home/$USER_NAME/web/$BASE_PATH/
-
+#RESTART
+sudo a2ensite $USER_NAME.conf
+sudo systemctl restart apache2
+sudo service apache2 restart
 
 #MYSQL USER AND DB
+DBNAME=$USER_NAME
+DBUSER=$USER_NAME
 /usr/bin/mysql -u root -p$DBROOT <<EOF
 CREATE DATABASE IF NOT EXISTS $DBNAME;
 CREATE USER $DBUSER@'localhost' IDENTIFIED BY '$DBPASS';
@@ -303,22 +300,10 @@ GRANT USAGE ON *.* TO '$DBUSER'@'localhost' IDENTIFIED BY '$DBPASS' WITH MAX_QUE
 GRANT ALL PRIVILEGES ON $DBNAME.* TO $DBUSER@'localhost';
 EOF
 
-
-#PERMISSIONS
-chown -R $USER_NAME:$USER_NAME /home/$USER_NAME/
-
-
-#RESTART
-sudo a2ensite $USER_NAME.conf
-sudo systemctl restart apache2
-sudo service apache2 restart
-
-
 #RESUME
 clear
 echo "###CIPI###Ok"
 
-
 #AUTOINSTALL
 if [ "$AUTO_INSTALL" = "laravel" ]; then
     cd /home/$USER_NAME/web/
@@ -330,4 +315,13 @@ if [ "$AUTO_INSTALL" = "wordpress" ]; then
     cd /home/$USER_NAME/web/
     rm -rf $BASE_PATH
     composer create-project johnpbloch/wordpress .
+    cd wordpress
+    cp wp-config-sample.php wp-config.php
+    sudo rpl -i -w "database_name_here" "$DBNAME" wp-config.php
+    sudo rpl -i -w "username_here" "$DBUSER" wp-config.php
+    sudo rpl -i -w "password_here" "$DBPASS" wp-config.php
 fi
+
+#PERMISSIONS
+chown -R $USER_NAME:$USER_NAME /home/$USER_NAME/web/
+chown -R $USER_NAME:$USER_NAME /home/$USER_NAME/web/$BASE_PATH/