diff --git a/Config/.clang-format b/Config/.clang-format index b012e9a..6e434f0 100755 --- a/Config/.clang-format +++ b/Config/.clang-format @@ -2,6 +2,7 @@ AlignAfterOpenBracket: Align AlignConsecutiveAssignments: + Enabled: true AlignCompound: true PadOperators: true AcrossEmptyLines: false @@ -29,7 +30,7 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: false SpacesInSquareBrackets: false -TabWidth: '4' +TabWidth: 4 UseTab: Never IndentPPDirectives: BeforeHash IndentCaseLabels: true diff --git a/Config/markdown.json b/Config/markdown.json index 28bae50..854b516 100755 --- a/Config/markdown.json +++ b/Config/markdown.json @@ -3,5 +3,6 @@ "no-duplicate-header": false, "no-inline-html": false, "ul-indent": 4, - "ol-indent": 4 + "ol-indent": 4, + "ul-style": "consistent" } \ No newline at end of file diff --git a/VM/config.vm.provision b/VM/config.vm.provision deleted file mode 100755 index dd44900..0000000 --- a/VM/config.vm.provision +++ /dev/null @@ -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 diff --git a/VM/oms.conf b/VM/oms.conf deleted file mode 100755 index ac05e86..0000000 --- a/VM/oms.conf +++ /dev/null @@ -1,13 +0,0 @@ - - ServerAdmin webmaster@localhost - DocumentRoot /home/spl1nes/Orange-Management - - - Options Indexes FollowSymLinks - AllowOverride None - Require all granted - - - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined -