Selaa lähdekoodia

phpmyadmin + fixies

Andrea Pollastri 5 vuotta sitten
vanhempi
commit
6523e652af

+ 1 - 0
app/Http/Controllers/ApplicationsController.php

@@ -25,6 +25,7 @@ class ApplicationsController extends Controller {
         $this->validate($request, [
         $this->validate($request, [
             'domain' => 'required',
             'domain' => 'required',
             'server_id' => 'required',
             'server_id' => 'required',
+            'basepath' => 'required',
             'php' => 'required'
             'php' => 'required'
         ]);
         ]);
         if(Application::where('domain', $request->domain)->where('server_id', $request->server_id)->first()) {
         if(Application::where('domain', $request->domain)->where('server_id', $request->server_id)->first()) {

+ 1 - 1
resources/views/applications.blade.php

@@ -104,7 +104,7 @@ Applications
                         <label for="basepath" class="col-md-4 col-form-label text-md-right">Basepath</label>
                         <label for="basepath" class="col-md-4 col-form-label text-md-right">Basepath</label>
                         <div class="col-md-6">
                         <div class="col-md-6">
                             <div class="form-group">
                             <div class="form-group">
-                                <input id="basepath" type="text" class="form-control" name="basepath" autocomplete="off" placeholder="E.g. 'public'" value="public">
+                                <input id="basepath" type="text" class="form-control" name="basepath" required autocomplete="off" placeholder="E.g. 'public'" value="public">
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>

+ 1 - 1
resources/views/server.blade.php

@@ -116,7 +116,7 @@
                         <label for="basepath" class="col-md-4 col-form-label text-md-right">Basepath</label>
                         <label for="basepath" class="col-md-4 col-form-label text-md-right">Basepath</label>
                         <div class="col-md-6">
                         <div class="col-md-6">
                             <div class="form-group">
                             <div class="form-group">
-                                <input id="basepath" type="text" class="form-control" name="basepath" autocomplete="off" placeholder="E.g. 'public'" value="public">
+                                <input id="basepath" type="text" class="form-control" name="basepath" required autocomplete="off" placeholder="E.g. 'public'" value="public">
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>

+ 6 - 0
storage/app/scripts/install.sh

@@ -416,6 +416,7 @@ sudo debconf-set-selections <<< "mysql-server mysql-server/root_password_again p
 sudo apt-get -y install mysql-server mysql-client
 sudo apt-get -y install mysql-server mysql-client
 
 
 fi
 fi
+
 echo "Mysql: OK!"
 echo "Mysql: OK!"
 sleep 3s
 sleep 3s
 
 
@@ -699,6 +700,11 @@ sudo cat > "$WELCOME" <<EOF
 </body>
 </body>
 </html>
 </html>
 EOF
 EOF
+
+sudo apt-get install -y php-curl
+sudo apt-get install -y yarn
+composer create-project phpmyadmin/phpmyadmin /var/www/html/pma
+
 clear
 clear
 echo "Cipi pages creation: OK!"
 echo "Cipi pages creation: OK!"
 sleep 3s
 sleep 3s