mirror of
https://github.com/Karaka-Management/Build.git
synced 2026-02-13 09:38:41 +00:00
update conf
This commit is contained in:
parent
dcd4e652d8
commit
7730b793f1
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
AlignAfterOpenBracket: Align
|
AlignAfterOpenBracket: Align
|
||||||
AlignConsecutiveAssignments:
|
AlignConsecutiveAssignments:
|
||||||
|
Enabled: true
|
||||||
AlignCompound: true
|
AlignCompound: true
|
||||||
PadOperators: true
|
PadOperators: true
|
||||||
AcrossEmptyLines: false
|
AcrossEmptyLines: false
|
||||||
|
|
@ -29,7 +30,7 @@ SpacesInCStyleCastParentheses: false
|
||||||
SpacesInContainerLiterals: false
|
SpacesInContainerLiterals: false
|
||||||
SpacesInParentheses: false
|
SpacesInParentheses: false
|
||||||
SpacesInSquareBrackets: false
|
SpacesInSquareBrackets: false
|
||||||
TabWidth: '4'
|
TabWidth: 4
|
||||||
UseTab: Never
|
UseTab: Never
|
||||||
IndentPPDirectives: BeforeHash
|
IndentPPDirectives: BeforeHash
|
||||||
IndentCaseLabels: true
|
IndentCaseLabels: true
|
||||||
|
|
|
||||||
|
|
@ -3,5 +3,6 @@
|
||||||
"no-duplicate-header": false,
|
"no-duplicate-header": false,
|
||||||
"no-inline-html": false,
|
"no-inline-html": false,
|
||||||
"ul-indent": 4,
|
"ul-indent": 4,
|
||||||
"ol-indent": 4
|
"ol-indent": 4,
|
||||||
|
"ul-style": "consistent"
|
||||||
}
|
}
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
Vagrant.configure("2") do |config|
|
|
||||||
config.vm.box = "ubuntu/trusty64"
|
|
||||||
config.vm.network "private_network", ip: "192.168.31.4"
|
|
||||||
|
|
||||||
config.vm.synced_folder ".", "/home/spl1nes/Orange-Management"
|
|
||||||
|
|
||||||
config.vm.provision "shell", inline: <<-SHELL
|
|
||||||
apt-get update
|
|
||||||
apt-get install -y lsb-release ca-certificates apt-transport-https software-properties-common
|
|
||||||
add-apt-repository ppa:ondrej/php
|
|
||||||
apt-get update
|
|
||||||
apt-get install -y apache2 mysql-server php8.1 php8.1-mysql
|
|
||||||
cp /home/spl1nes/Orange-Management/Build/VM/oms.conf /etc/apache2/sites-available/oms.conf
|
|
||||||
a2ensite development.conf
|
|
||||||
a2dissite 000-default.conf
|
|
||||||
systemctl reload apache2
|
|
||||||
|
|
||||||
echo "create database development" | mysql
|
|
||||||
echo "CREATE USER 'development'@'localhost' IDENTIFIED BY 'development'" | mysql
|
|
||||||
echo "GRANT ALL PRIVILEGES ON development.* TO 'development'@'localhost';" | mysql
|
|
||||||
echo "flush privileges" | mysql
|
|
||||||
SHELL
|
|
||||||
end
|
|
||||||
13
VM/oms.conf
13
VM/oms.conf
|
|
@ -1,13 +0,0 @@
|
||||||
<VirtualHost *:80>
|
|
||||||
ServerAdmin webmaster@localhost
|
|
||||||
DocumentRoot /home/spl1nes/Orange-Management
|
|
||||||
|
|
||||||
<Directory /home/spl1nes/Orange-Management>
|
|
||||||
Options Indexes FollowSymLinks
|
|
||||||
AllowOverride None
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
ErrorLog ${APACHE_LOG_DIR}/error.log
|
|
||||||
CustomLog ${APACHE_LOG_DIR}/access.log combined
|
|
||||||
</VirtualHost>
|
|
||||||
Loading…
Reference in New Issue
Block a user